diff --git a/flake.nix b/flake.nix
index 3319039..2078712 100755
--- a/flake.nix
+++ b/flake.nix
@@ -475,6 +475,14 @@
                     pi5-sops-nix.homeManagerModules.sops
                   ];
                 };
+              home-manager.users.root =
+                { ... }:
+                {
+                  imports = [
+                    ./share/root-user
+                    pi5-sops-nix.homeManagerModules.sops
+                  ];
+                };
             }
           ];
         };
@@ -515,6 +523,14 @@
                     pi4-sops-nix.homeManagerModules.sops
                   ];
                 };
+              home-manager.users.root =
+                { ... }:
+                {
+                  imports = [
+                    ./share/root-user
+                    pi4-sops-nix.homeManagerModules.sops
+                  ];
+                };
             }
           ];
         };
@@ -544,6 +560,14 @@
                     steamdeck-steam-rom-manager.homeManagerModules.default
                   ];
                 };
+              home-manager.users.root =
+                { ... }:
+                {
+                  imports = [
+                    ./share/root-user
+                    steamdeck-sops-nix.homeManagerModules.sops
+                  ];
+                };
               home-manager.backupFileExtension = "backup";
             }
 
diff --git a/hosts/deck/configuration.nix b/hosts/deck/configuration.nix
index 1e851ab..da3ce01 100755
--- a/hosts/deck/configuration.nix
+++ b/hosts/deck/configuration.nix
@@ -107,6 +107,8 @@
     shell = pkgs.zsh;
   };
 
+  users.users.root.shell = pkgs.zsh;
+
   programs = {
     gamemode.enable = lib.mkDefault true;
     zsh.enable = true;
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 65dcf71..e8e6155 100755
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -21,7 +21,7 @@ in
     fsType = "tmpfs";
     options = [
       "defaults"
-      "size=256G"
+      "size=25%"
       "mode=755"
     ];
   };
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 28524d0..d8a3f8b 100755
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -121,11 +121,12 @@ in
 
     git = {
       enable = true;
+      package = pkgs.git.override { withLibsecret = true; };
       userName = "mjallen18";
       userEmail = "matt.l.jallen@gmail.com";
       aliases = gitAliases;
       extraConfig = {
-        credential.helper = "gnome-keyring";
+        credential.helper = "libsecret";
       };
     };
 
@@ -203,19 +204,11 @@ in
     protonup
     protontricks
     protonvpn-gui
-    protonvpn-gui
-    python3
-    python312Packages.tox
-    python312Packages.setuptools
-    python312Packages.pytest
-    python312Packages.pytest-cov
-    python312Packages.pyaml
     qmk
     remmina
     smile
     sops
     spotify
-    ssh-to-pgp
     tree
     unigine-heaven
     vesktop
diff --git a/hosts/desktop/users.nix b/hosts/desktop/users.nix
index f1ee414..37e695b 100644
--- a/hosts/desktop/users.nix
+++ b/hosts/desktop/users.nix
@@ -19,4 +19,6 @@ in
     hashedPasswordFile = passwordFile;
     shell = pkgsVersion.zsh;
   };
+
+  users.users.root.shell = pkgsVersion.zsh;
 }
\ No newline at end of file
diff --git a/hosts/nas/users.nix b/hosts/nas/users.nix
index 23c8df2..419efd8 100755
--- a/hosts/nas/users.nix
+++ b/hosts/nas/users.nix
@@ -82,5 +82,7 @@ in
       ];
       hashedPasswordFile = passwordFile;
     };
+
+    users.root.shell = pkgs.zsh;
   };
 }
\ No newline at end of file
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index 7922ae1..e665c7a 100755
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -72,5 +72,7 @@ in
       ];
       shell = pkgs.zsh;
     };
+
+    users.root.shell = pkgs.zsh;
   };
 }
diff --git a/hosts/pi5/configuration.nix b/hosts/pi5/configuration.nix
index d123209..8505c8d 100755
--- a/hosts/pi5/configuration.nix
+++ b/hosts/pi5/configuration.nix
@@ -85,5 +85,7 @@ in
       ];
       shell = pkgs.zsh;
     };
+
+    users.root.shell = pkgs.zsh;
   };
 }