shuffled root user options

2025-07-03 00:27:12 -05:00
parent 7220d8eed2
commit de44f365fb
1 changed files with 20 additions and 15 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -65,11 +65,8 @@
        home-manager = {
          useUserPackages = true;
          extraSpecialArgs = { inherit inputs; };
-          users.root.home.stateVersion = config.stateVersion;
-          users.root.programs.git = {
-            extraConfig.credential.helper = "store --file ~/.git-credentials";
-          };
-          users.${config.user} = {
+          users = {
+            ${config.user} = {
              imports = [
                self.homeManagerModules.default {
                  user = config.user;
@@ -81,6 +78,14 @@
                }
              ] ++ config.extraImports;
            };
+          } // lib.optionalAttrs config.root {
+            root = {
+              home.stateVersion = config.stateVersion;
+              programs.git = {
+                extraConfig.credential.helper = "store --file ~/.git-credentials";
+              };
+            };
+          };
        };
      };
    };