From 995f0142b0dad418f66dccd20f173f5dfeb26825 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Mon, 23 Jan 2023 23:22:14 -0800
Subject: [PATCH] working home manager

---
 home.nix           |  6 ------
 systems/common.nix | 29 -----------------------------
 user-jsutter.nix   | 45 +++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 home.nix

diff --git a/home.nix b/home.nix
deleted file mode 100644
index 24bcc74..0000000
--- a/home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-    home.username = "jsutter";
-    home.homeDirectory = "/home/jsutter";
-    home.stateVersion = "23.05"; # To figure this out you can comment out the line and see what version it expected.
-    programs.home-manager.enable = true;
-}
diff --git a/systems/common.nix b/systems/common.nix
index daa211e..977f4a3 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -15,35 +15,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  users.users.jsutter = {
-    isNormalUser = true;
-    description = "Julian Sutter";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      git
-      tor-browser-bundle-bin
-      nextcloud-client
-      vlc
-      deluge
-      steam
-      vmware-horizon-client
-      kleopatra
-      pinentry
-      arc-theme
-      zoom-us
-      slack
-      vscodium
-    ];
-  };
-
-  # Options for Steam
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
   # hardware
   hardware.enableRedistributableFirmware = true;
 
diff --git a/user-jsutter.nix b/user-jsutter.nix
index af01df3..ccb3bd5 100644
--- a/user-jsutter.nix
+++ b/user-jsutter.nix
@@ -11,8 +11,42 @@ in
     (import "${home-manager}/nixos")
   ];
 
+  users.users.jsutter = {
+    isNormalUser = true;
+    description = "Julian Sutter";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+      git
+      tor-browser-bundle-bin
+      nextcloud-client
+      vlc
+      deluge
+      steam
+      vmware-horizon-client
+      kleopatra
+      pinentry
+      arc-theme
+      zoom-us
+      slack
+      vscodium
+    ];
+  };
+
+  # Options for Steam
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+
   home-manager.users.jsutter = {
 
+    home.username = "jsutter";
+    home.homeDirectory = "/home/jsutter";
+    programs.home-manager.enable = true;
+
     home.stateVersion = "22.11";
 
     # Git Configuration
@@ -29,10 +63,13 @@ in
     };
 
 # Add Firefox GNOME theme directory
-#  home.file."firefox-gnome-theme" = {
-#        target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
-#        source = (fetchTarball "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz");
-#  };
+  home.file."firefox-gnome-theme" = {
+    target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
+    source = fetchTarball {
+      url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz";
+      sha256 = "0qgqx25a06qqnzsmsnav00w1z850mxqvmsx5pa5pdkzszgc1qsvv";
+    };
+  };
 
   programs.firefox = {
         enable = true;