Refactor home manager, and add desktop node on sparky.

flake.nix

@@ -54,8 +54,8 @@
         };
       };
 
-      mkNixos =
-        system: modules:
+      mkHost =
+        system: profile: modules:
         nixpkgs.lib.nixosSystem {
           system = system;
           modules = [
@@ -69,31 +69,30 @@
             disko.nixosModules.disko
             sops-nix.nixosModules.sops
             impermanence.nixosModules.impermanence
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                users.ppetru = {
+                  imports = [
+                    (inputs.impermanence + "/home-manager.nix")
+                    inputs.nix-index-database.homeModules.nix-index
+                    inputs.nixvim.homeModules.nixvim
+                    ./home
+                  ];
+                };
+                extraSpecialArgs = {
+                  inherit profile;
+                };
+              };
+            }
           ] ++ modules;
           specialArgs = {
             inherit inputs self;
           };
         };
 
-      mkHMNixos =
-        system: modules:
-        mkNixos system ([
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.ppetru = {
-                imports = [
-                  (inputs.impermanence + "/home-manager.nix")
-                  inputs.nix-index-database.homeModules.nix-index
-                  inputs.nixvim.homeModules.nixvim
-                  ./home
-                ];
-              };
-            };
-          }] ++ modules);
-
       pkgsFor =
         system:
         import nixpkgs {
@@ -119,16 +118,16 @@
     in
     {
       nixosConfigurations = {
-        c1 = mkHMNixos "x86_64-linux" [ ./hosts/c1 ];
-        c2 = mkHMNixos "x86_64-linux" [ ./hosts/c2 ];
-        c3 = mkHMNixos "x86_64-linux" [ ./hosts/c3 ];
-        alo-cloud-1 = mkHMNixos "aarch64-linux" [ ./hosts/alo-cloud-1 ];
-        zippy = mkHMNixos "x86_64-linux" [
+        c1 = mkHost "x86_64-linux" "server" [ ./hosts/c1 ];
+        c2 = mkHost "x86_64-linux" "server" [ ./hosts/c2 ];
+        c3 = mkHost "x86_64-linux" "server" [ ./hosts/c3 ];
+        alo-cloud-1 = mkHost "aarch64-linux" "server" [ ./hosts/alo-cloud-1 ];
+        zippy = mkHost "x86_64-linux" "workstation" [
           ethereum-nix.nixosModules.default
           ./hosts/zippy
         ];
-        chilly = mkHMNixos "x86_64-linux" [ ./hosts/chilly ];
-        sparky = mkHMNixos "x86_64-linux" [ ./hosts/sparky ];
+        chilly = mkHost "x86_64-linux" "workstation" [ ./hosts/chilly ];
+        sparky = mkHost "x86_64-linux" "desktop" [ ./hosts/sparky ];
       };
 
       deploy = {