diff --git a/base.nix b/base.nix
index f575bb3..9ce71b3 100644
--- a/base.nix
+++ b/base.nix
@@ -63,8 +63,6 @@
     };
   };
 
-  programs.git.enable = true;
-
   security.doas = {
     enable = true;
     extraRules = [
diff --git a/flake.nix b/flake.nix
index 4d5b7f5..e320fa5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,7 @@
                   {
                     home-manager.useUserPackages = true;
                     home-manager.users.vbm = ./hosts/${name}/home.nix;
+                    home-manager.users.root = ./home/users/root.nix;
                     home-manager.extraSpecialArgs = { inherit inputs system stable; };
                     home-manager.sharedModules = [
                       inputs.nixvim.homeModules.nixvim
@@ -87,6 +88,7 @@
                   {
                     home-manager.useUserPackages = true;
                     home-manager.users.vbm = ./hosts/${name}/home.nix;
+                    home-manager.users.root = ./home/users/root.nix;
                     home-manager.extraSpecialArgs = { inherit inputs system stable; };
                     home-manager.sharedModules = [
                       inputs.nixvim-unstable.homeModules.nixvim
diff --git a/home/users/root.nix b/home/users/root.nix
new file mode 100644
index 0000000..db813e6
--- /dev/null
+++ b/home/users/root.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+  home = {
+    stateVersion = "25.11";
+  };
+
+  programs.git = {
+    enable = true;
+    settings = {
+      safe.directory = "*";
+    };
+  };
+}
diff --git a/home/home.nix b/home/users/vbm.nix
similarity index 98%
rename from home/home.nix
rename to home/users/vbm.nix
index 443a595..697cd81 100644
--- a/home/home.nix
+++ b/home/users/vbm.nix
@@ -8,11 +8,11 @@
 {
 
   imports = [
-    ./programs/ssh.nix
+    ./../programs/ssh.nix
   ];
 
   sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops_id_ed25519" ];
-  sops.defaultSopsFile = ../secrets/secret.yaml;
+  sops.defaultSopsFile = ../../secrets/secret.yaml;
 
   home = {
     username = "vbm";
diff --git a/hosts/perseus/home.nix b/hosts/perseus/home.nix
index fcde324..be22872 100644
--- a/hosts/perseus/home.nix
+++ b/hosts/perseus/home.nix
@@ -1,10 +1,8 @@
-{
-  ...
-}:
+{ ... }:
 {
 
   imports = [
-    ../../home/home.nix
+    ../../home/users/vbm.nix
     ../../home/programs/foot.nix
     ../../home/programs/neovim.nix
     ../../home/programs/retroarch.nix
diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix
index 8f24e98..20a38c6 100644
--- a/hosts/talos/home.nix
+++ b/hosts/talos/home.nix
@@ -4,7 +4,7 @@
 {
 
   imports = [
-    ../../home/home.nix
+    ../../home/users/vbm.nix
     ../../home/email.nix
     ../../home/programs/foot.nix
     ../../home/programs/neovim.nix