working on machines

Droidnix/flake.nix

@@ -56,10 +56,7 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = {
+              home-manager.extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; };
-                inherit user inputs;
-                flakeRoot = ./.;
-              };
             }
 
             # Catppuccin theme module
@@ -69,27 +66,22 @@
             ./generated/top.nix
 
             # Ensure Home Manager is enabled for the user
-            (
+            ({ config, pkgs, ... }: {
-              { config, pkgs, ... }:
+              programs.home-manager.enable = true;
-              {
+              systemd.users.services."home-manager-${user.username}" = {
-                programs.home-manager.enable = true;
+                description = "Home Manager service for ${user.username}";
-                systemd.users.services."home-manager-${user.username}" = {
+                wantedBy = [ "multi-user.target" ];
-                  description = "Home Manager service for ${user.username}";
+                serviceConfig.Type = "oneshot";
-                  wantedBy = [ "multi-user.target" ];
+                serviceConfig.RemainAfterExit = true;
-                  serviceConfig.Type = "oneshot";
+                serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
-                  serviceConfig.RemainAfterExit = true;
+              };
-                  serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
+            })
-                };
-              }
-            )
           ];
-          specialArgs = {
+          specialArgs = { inherit user inputs; flakeRoot = ./.; };
-            inherit user inputs;
-            flakeRoot = ./.;
-          };
         }
       );
 
+      # Home Manager configurations for each user/machine
       homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) (
         userMachine:
         let