5 files changed, 23 insertions, 20 deletions
diff --git a/flake.nix b/flake.nix
index 388fb48..750c21a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,13 +23,10 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/carmel/configuration.nix
-          ./users/fcuny
-          ./modules/systems
-          ./modules/desktop
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.fcuny = import ./users/fcuny/home-manager.nix;
+            home-manager.users.fcuny = import ./users/fcuny/desktop.nix;
           }
         ];
       };
diff --git a/hosts/carmel/configuration.nix b/hosts/carmel/configuration.nix
index 5cbea50..449564b 100644
--- a/hosts/carmel/configuration.nix
+++ b/hosts/carmel/configuration.nix
@@ -4,6 +4,9 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../users/fcuny
+      ../../modules/systems
+      ../../modules/desktop
     ];
 
   nix = {
diff --git a/users/fcuny/home-manager.nix b/users/fcuny/common.nix
index 95c1820..04bc1c1 100644
--- a/users/fcuny/home-manager.nix
+++ b/users/fcuny/common.nix
@@ -1,12 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs ... }
 
 {
-  xdg.enable = true;
-
-  imports = [
-    ./i3.nix
-  ];
-
   home.packages = [
     pkgs.jq
     pkgs.ripgrep
@@ -23,12 +17,4 @@
     enable = true;
     goPath = "workspace/go";
   };
-
-  programs.alacritty = {
-    enable = true;
-
-    settings = {
-      env.TERM = "xterm-256color";
-    };
-  };
 }
diff --git a/users/fcuny/desktop.nix b/users/fcuny/desktop.nix
new file mode 100644
index 0000000..6ded2a0
--- /dev/null
+++ b/users/fcuny/desktop.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+{
+  xdg.enable = true;
+
+  imports = [
+    ./common.nix
+    ./i3.nix
+  ];
+
+  programs.alacritty = {
+    enable = true;
+
+    settings = {
+      env.TERM = "xterm-256color";
+    };
+  };
+}
diff --git a/users/fcuny/i3.nix b/users/fcuny/i3.nix
index b09a439..aa97cb8 100644
--- a/users/fcuny/i3.nix
+++ b/users/fcuny/i3.nix
@@ -14,7 +14,6 @@
     extraConfig = {
       modi = "drun";
       show-icons = true;
-      icon-theme = "Numix-Square";
       combi-modi = "window,drun,ssh";
     };
   };