migrate to combined home/normal modules

provision/home-modules/default.nix

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

provision/home-modules/desktop/kitty.nix

@@ -1,23 +0,0 @@
-{ 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,35 +26,23 @@
       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,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs; };
+  specialArgs = { inherit user inputs home-manger; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
@@ -13,11 +13,6 @@
       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,8 +52,10 @@
       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;
@@ -71,12 +73,4 @@
       };
     };
   };
-
-  home-manager.users.${user} = {
-    modules = {
-      desktop = {
-        kitty.enable = true;
-      };
-    };
-  };
 }

provision/hosts/kestrel/default.nix

@@ -1,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs; };
+  specialArgs = { inherit user inputs home-manager; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
@@ -13,11 +13,6 @@
       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,13 +35,10 @@
       python.enable = true;
       tooling.enable = true;
     };
-    gaming = {
+    programs = {
-      steam.enable = false;
+      kitty.enable = true;
-      emulation.enable = false;
-      misc.enable = false;
     };
     services = {
-      jellyfin.enable = false;
       peripherals.enable = true;
       samba-client.enable = true;
       virt-manager.enable = false;
@@ -50,15 +47,6 @@
       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,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs; };
+  specialArgs = { inherit user inputs home-manager; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
@@ -13,11 +13,6 @@
       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,12 +104,4 @@
       ssh.enable = true;
     };
   };
-
-  home-manager.users.${user} = {
-    modules = {
-      desktop = {
-        kitty.enable = false;
-      };
-    };
-  };
 }

provision/hosts/torus/default.nix

@@ -1,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs; };
+  specialArgs = { inherit user inputs home-manager; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
@@ -13,11 +13,6 @@
       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,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs nixos-wsl; };
+  specialArgs = { inherit user inputs nixos-wsl home-manger; };
   modules = [
     ../default          # shared by all configs
     ./configuration.nix # wsl specific
@@ -11,11 +11,6 @@
       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 ./system ./services ];
+  imports = [ ./desktop ./devel ./gaming ./programs ./system ./services ];
 }

provision/modules/programs/kitty.nix

@@ -0,0 +1,25 @@
+{ 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";
+        };
+      };
+    };
+  };
+}