provision/home-modules/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./desktop ];
+}

provision/home-modules/desktop/kitty.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, user, ... }:
+
+let cfg = config.modules.desktop.kitty;
+in {
+  options.modules.desktop.kitty.enable = lib.mkEnableOption "kitty";
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      nerdfonts
+    ];
+
+    programs.kitty = {
+      enable = true;
+      theme = "Gruvbox Dark";
+      font.name = "JetBrainsMono Nerd Font";
+      shellIntegration.mode = "no-cursor";
+      settings = {
+        disable_ligatures = "never";
+        cursor_shape = "block";
+        linux_display_server = "x11";
+      };
+    };
+  };
+}

provision/hosts/bulwark/configuration.nix

@@ -26,23 +26,35 @@
       browser.enable = true;
     };
     devel = {
+      engineering.enable = false;
       notes.enable = true;
+      python.enable = false;
+      tooling.enable = false;
     };
     gaming = {
       steam.enable = true;
       emulation.enable = true;
       misc.enable = true;
     };
-    programs = {
-      kitty.enable = true;
-    };
     services = {
+      jellyfin.enable = false;
+      peripherals.enable = false;
       samba-client.enable = true;
+      virt-manager.enable = false;
     };
     system = {
       nipr.enable = true;
       ssh.enable = true;
       terminal.enable = true;
+      wireguard-client.enable = false;
+    };
+  };
+
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
     };
   };
 }

provision/hosts/bulwark/default.nix

@@ -1,11 +1,11 @@
 { lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs home-manger; };
+  specialArgs = { inherit user inputs; };
   modules = [
-    ../default                            # shared by all configs
+    ../default # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
-    ./configuration.nix                   # bulwark specific
+    ./configuration.nix # bulwark specific
     ./hardware.nix
     ../../modules
     agenix.nixosModules.default
@@ -13,6 +13,11 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = { inherit user; };
+      home-manager.users.${user} = {
+        imports = [ 
+          ../../home-modules
+        ];
+      };
     }
   ];
 }

provision/hosts/kestrel/configuration.nix

@@ -52,10 +52,8 @@
       emulation.enable = true;
       misc.enable = true;
     };
-    programs = {
-      kitty.enable = true;
-    };
     services = {
+      jellyfin.enable = false;
       peripherals.enable = true;
       samba-client.enable = true;
       virt-manager.enable = true;
@@ -73,4 +71,12 @@
       };
     };
   };
+
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
+    };
+  };
 }

provision/hosts/kestrel/default.nix

@@ -1,11 +1,11 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs home-manager; };
+  specialArgs = { inherit user inputs; };
   modules = [
-    ../default                            # shared by all configs
+    ../default # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
-    ./configuration.nix                   # kestrel specific
+    ./configuration.nix # kestrel specific
     ./hardware.nix
     ../../modules
     agenix.nixosModules.default
@@ -13,6 +13,11 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = { inherit user; };
+      home-manager.users.${user} = {
+        imports = [ 
+          ../../home-modules
+        ];
+      };
     }
   ];
 }

provision/hosts/shivan/configuration.nix

@@ -35,10 +35,13 @@
       python.enable = true;
       tooling.enable = true;
     };
-    programs = {
+    gaming = {
-      kitty.enable = true;
+      steam.enable = false;
+      emulation.enable = false;
+      misc.enable = false;
     };
     services = {
+      jellyfin.enable = false;
       peripherals.enable = true;
       samba-client.enable = true;
       virt-manager.enable = false;
@@ -47,6 +50,15 @@
       nipr = true;
       ssh.enable = true;
       terminal.enable = true;
+      wireguard-client.enable = false;
+    };
+  };
+
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
     };
   };
 }

provision/hosts/shivan/default.nix

@@ -1,11 +1,11 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs home-manager; };
+  specialArgs = { inherit user inputs; };
   modules = [
-    ../default                            # shared by all configs
+    ../default # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
-    ./configuration.nix                   # shivan specific
+    ./configuration.nix # shivan specific
     ./hardware.nix
     ../../modules
     agenix.nixosModules.default
@@ -13,6 +13,11 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = { inherit user; };
+      home-manager.users.${user} = {
+        imports = [ 
+          ../../home-modules
+        ];
+      };
     }
   ];
 }

provision/hosts/torus/configuration.nix

@@ -104,4 +104,12 @@
       ssh.enable = true;
     };
   };
+
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = false;
+      };
+    };
+  };
 }

provision/hosts/torus/default.nix

@@ -1,11 +1,11 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs home-manager; };
+  specialArgs = { inherit user inputs; };
   modules = [
-    ../default                            # shared by all configs
+    ../default # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
-    ./configuration.nix                   # torus specific
+    ./configuration.nix # torus specific
     ./hardware.nix
     ../../modules
     agenix.nixosModules.default
@@ -13,6 +13,11 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = { inherit user; };
+      home-manager.users.${user} = {
+        imports = [ 
+          ../../home-modules
+        ];
+      };
     }
   ];
 }

provision/hosts/wsl/default.nix

@@ -1,9 +1,9 @@
 { lib, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs nixos-wsl home-manger; };
+  specialArgs = { inherit user inputs nixos-wsl; };
   modules = [
-    ../default          # shared by all configs
+    ../default # shared by all configs
     ./configuration.nix # wsl specific
     ../../modules
     agenix.nixosModules.default
@@ -11,6 +11,11 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = { inherit user; };
+      home-manager.users.${user} = {
+        imports = [ 
+          ../../home-modules
+        ];
+      };
     }
   ];
 }

provision/modules/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./desktop ./devel ./gaming ./programs ./system ./services ];
+  imports = [ ./desktop ./devel ./gaming ./system ./services ];
 }

provision/modules/desktop/gnome.nix

@@ -115,6 +115,8 @@ in {
 
     home-manager.users.${user} = {
       # Remove unwanted desktop entries
+      # Some are added to ~/.local/share/applications and must be removed manually there
+      # TODO: Use chezmoi to Hide these desktop files
       xdg.desktopEntries.cups = { name = ""; exec = null; settings.Hidden = "true"; };
       xdg.desktopEntries.writer = { name = ""; exec = null; settings.Hidden = "true"; };
       xdg.desktopEntries.math = { name = ""; exec = null; settings.Hidden = "true"; };

provision/modules/programs/kitty.nix

@@ -1,25 +0,0 @@
-{ config, lib, pkgs, user, inputs, home-manager, ... }:
-
-let cfg = config.modules.programs.kitty;
-in {
-  options.modules.programs.kitty.enable = lib.mkEnableOption "kitty";
-  config = lib.mkIf cfg.enable {
-    home-manager.users.${user} = {
-      home.packages = with pkgs; [
-        nerdfonts
-      ];
-
-      programs.kitty = {
-        enable = true;
-        theme = "Gruvbox Dark";
-        font.name = "JetBrainsMono Nerd Font";
-        shellIntegration.mode = "no-cursor";
-        settings = {
-          disable_ligatures = "never";
-          cursor_shape = "block";
-          linux_display_server = "x11";
-        };
-      };
-    };
-  };
-}