shuffled root user options

flake.nix

@@ -65,11 +65,8 @@
         home-manager = {
           useUserPackages = true;
           extraSpecialArgs = { inherit inputs; };
-          users.root.home.stateVersion = config.stateVersion;
+          users = {
-          users.root.programs.git = {
+            ${config.user} = {
-            extraConfig.credential.helper = "store --file ~/.git-credentials";
-          };
-          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";
+              };
+            };
+          };
         };
       };
     };