diff --git a/hosts/_common/components/home_manager.nix b/hosts/_common/components/home_manager.nix
index 71bba3c..df9bd06 100644
--- a/hosts/_common/components/home_manager.nix
+++ b/hosts/_common/components/home_manager.nix
@@ -3,7 +3,7 @@ let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
     # to get hash run `nix-prefetch-url --unpack "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"`
-    sha256 = "0g51f2hz13dk953i501fmc6935difhz60741nypaqwz127hy5ldk";
+    sha256 = "0r19x4n1wlsr9i3w4rlc4jc5azhv2yq1n3qb624p0dhhwfj3c3vl";
   };
 in
 {
@@ -19,4 +19,3 @@ in
   home-manager.extraSpecialArgs = { inherit settings; inherit ylib; inherit (inputs) ragenix; inherit (config) age; };
 }
 
-
diff --git a/users/josh/by_hosts/gpdPocket3/nix_modules/sudo_no_passwd.nix b/users/josh/by_hosts/gpdPocket3/nix_modules/sudo_no_passwd.nix
new file mode 100644
index 0000000..cbfbdfa
--- /dev/null
+++ b/users/josh/by_hosts/gpdPocket3/nix_modules/sudo_no_passwd.nix
@@ -0,0 +1,15 @@
+{ pkgs, settings, ... }:
+{
+  security.sudo.extraRules = [
+    {
+      users = [ settings.user.username ];
+      commands = [
+        {
+          command = "ALL";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+    }
+  ];
+}
+
diff --git a/users/josh/by_hosts/gpdPocket3/readme.md b/users/josh/by_hosts/gpdPocket3/readme.md
new file mode 100644
index 0000000..e69de29
diff --git a/users/josh/by_hosts/joe/spotifyd.nix b/users/josh/by_hosts/joe/home_manager/spotifyd.nix
similarity index 100%
rename from users/josh/by_hosts/joe/spotifyd.nix
rename to users/josh/by_hosts/joe/home_manager/spotifyd.nix
diff --git a/users/josh/by_hosts/joe/vlc.nix b/users/josh/by_hosts/joe/home_manager/vlc.nix
similarity index 100%
rename from users/josh/by_hosts/joe/vlc.nix
rename to users/josh/by_hosts/joe/home_manager/vlc.nix
diff --git a/users/josh/by_hosts/joe/readme.md b/users/josh/by_hosts/joe/readme.md
new file mode 100644
index 0000000..e69de29
diff --git a/users/josh/configuration.nix b/users/josh/configuration.nix
index 6b41ecc..390db88 100644
--- a/users/josh/configuration.nix
+++ b/users/josh/configuration.nix
@@ -13,18 +13,23 @@
     enable = true;
   };
 
+  imports = ylib.umport {
+    path = lib.fileset.maybeMissing ./by_hosts/${settings.system.hostname}/nix_modules;
+    recursive = true;
+  };
+
   home-manager.users.${settings.user.username} = {
     imports =
       # Common settings all users share
       [ (settings.usersDir + "/_common/home.nix") ]
       # Programs
       ++ ylib.umport {
-        path =  ./programs;
+        path = ./home_manager;
         recursive = true;
       }
       # Programs by host
       ++ ylib.umport {
-        path = lib.fileset.maybeMissing ./by_hosts/${settings.system.hostname};
+        path = lib.fileset.maybeMissing ./by_hosts/${settings.system.hostname}/home_manager;
         recursive = true;
       };
   };
diff --git a/users/josh/programs/alacritty.nix b/users/josh/home_manager/alacritty.nix
similarity index 100%
rename from users/josh/programs/alacritty.nix
rename to users/josh/home_manager/alacritty.nix
diff --git a/users/josh/programs/atuin.nix b/users/josh/home_manager/atuin.nix
similarity index 100%
rename from users/josh/programs/atuin.nix
rename to users/josh/home_manager/atuin.nix
diff --git a/users/josh/programs/chrome.nix b/users/josh/home_manager/chrome.nix
similarity index 100%
rename from users/josh/programs/chrome.nix
rename to users/josh/home_manager/chrome.nix
diff --git a/users/josh/programs/comma.nix b/users/josh/home_manager/comma.nix
similarity index 100%
rename from users/josh/programs/comma.nix
rename to users/josh/home_manager/comma.nix
diff --git a/users/josh/programs/de/gnome.nix b/users/josh/home_manager/de/gnome.nix
similarity index 100%
rename from users/josh/programs/de/gnome.nix
rename to users/josh/home_manager/de/gnome.nix
diff --git a/users/josh/programs/de/gtk.nix b/users/josh/home_manager/de/gtk.nix
similarity index 100%
rename from users/josh/programs/de/gtk.nix
rename to users/josh/home_manager/de/gtk.nix
diff --git a/users/josh/programs/discord.nix b/users/josh/home_manager/discord.nix
similarity index 100%
rename from users/josh/programs/discord.nix
rename to users/josh/home_manager/discord.nix
diff --git a/users/josh/programs/firefox.nix b/users/josh/home_manager/firefox.nix
similarity index 100%
rename from users/josh/programs/firefox.nix
rename to users/josh/home_manager/firefox.nix
diff --git a/users/josh/programs/nautilus.nix b/users/josh/home_manager/nautilus.nix
similarity index 100%
rename from users/josh/programs/nautilus.nix
rename to users/josh/home_manager/nautilus.nix
diff --git a/users/josh/programs/ollama.nix b/users/josh/home_manager/ollama.nix
similarity index 100%
rename from users/josh/programs/ollama.nix
rename to users/josh/home_manager/ollama.nix
diff --git a/users/josh/programs/postgres.nix b/users/josh/home_manager/postgres.nix
similarity index 100%
rename from users/josh/programs/postgres.nix
rename to users/josh/home_manager/postgres.nix
diff --git a/users/josh/programs/starship.nix b/users/josh/home_manager/starship.nix
similarity index 100%
rename from users/josh/programs/starship.nix
rename to users/josh/home_manager/starship.nix
diff --git a/users/josh/programs/tmux/tmux-reset.conf b/users/josh/home_manager/tmux/tmux-reset.conf
similarity index 100%
rename from users/josh/programs/tmux/tmux-reset.conf
rename to users/josh/home_manager/tmux/tmux-reset.conf
diff --git a/users/josh/programs/tmux/tmux.nix b/users/josh/home_manager/tmux/tmux.nix
similarity index 100%
rename from users/josh/programs/tmux/tmux.nix
rename to users/josh/home_manager/tmux/tmux.nix
diff --git a/users/josh/programs/vivaldi.nix b/users/josh/home_manager/vivaldi.nix
similarity index 100%
rename from users/josh/programs/vivaldi.nix
rename to users/josh/home_manager/vivaldi.nix
diff --git a/users/josh/programs/wezterm/wezterm.lua b/users/josh/home_manager/wezterm/wezterm.lua
similarity index 100%
rename from users/josh/programs/wezterm/wezterm.lua
rename to users/josh/home_manager/wezterm/wezterm.lua
diff --git a/users/josh/programs/wezterm/wezterm.nix b/users/josh/home_manager/wezterm/wezterm.nix
similarity index 100%
rename from users/josh/programs/wezterm/wezterm.nix
rename to users/josh/home_manager/wezterm/wezterm.nix
diff --git a/users/josh/programs/zoxide.nix b/users/josh/home_manager/zoxide.nix
similarity index 100%
rename from users/josh/programs/zoxide.nix
rename to users/josh/home_manager/zoxide.nix
diff --git a/users/josh/programs/zsh.nix b/users/josh/home_manager/zsh.nix
similarity index 100%
rename from users/josh/programs/zsh.nix
rename to users/josh/home_manager/zsh.nix