diff --git a/flake.nix b/flake.nix
index 6f99b6a9..af5326e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
       extraSpecialArgs = inputs;
     };
   in {
-    # nh os switch /path --hostname=host
+    # nh os switch /path -H host
     nixosConfigurations = {
       tower = mkNix [ ./hosts/tower ] stable; # Main Desktop
 
diff --git a/modules/home/programs/terminal/nh/default.nix b/modules/home/programs/terminal/nh/default.nix
index c1fe0a0d..52aa9908 100644
--- a/modules/home/programs/terminal/nh/default.nix
+++ b/modules/home/programs/terminal/nh/default.nix
@@ -1,7 +1,7 @@
-{ ... }:
+{ config, ... }:
 {
   programs.nh = {
     enable = true;
-    flake = "/etc/nixos";
+    flake = "${config.home.homeDirectory}/Projects/nixos-config";
   };
 }
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index 49c33f86..118e9e5d 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -97,23 +97,23 @@
     file = {
       ".local/share/ranger/bookmarks".text = ''
         # Local files
-        h:/home/${config.home.username}/
-        k:/home/${config.home.username}/Keepers
-        j:/home/${config.home.username}/Downloads
-        v:/home/${config.home.username}/Videos
-        c:/home/${config.home.username}/.config
-        l:/home/${config.home.username}/.local
+        h:${config.home.homeDirectory}/
+        k:${config.home.homeDirectory}/Keepers
+        j:${config.home.homeDirectory}/Downloads
+        v:${config.home.homeDirectory}/Videos
+        n:${config.home.homeDirectory}/Projects/nixos-config
+        c:${config.home.homeDirectory}/.config
+        l:${config.home.homeDirectory}/.local
         d:/mnt
         p:/persist
-        n:/etc/nixos
 
         # Remote files
-        N:/home/${config.home.username}/Network
-        H:/home/${config.home.username}/Network/Midas/
-        K:/home/${config.home.username}/Network/Midas/Files
-        M:/home/${config.home.username}/Network/Midas/Music
-        V:/home/${config.home.username}/Network/Midas/Videos
-        P:/home/${config.home.username}/Network/Midas/Photos
+        N:${config.home.homeDirectory}/Network
+        H:${config.home.homeDirectory}/Network/Midas/
+        K:${config.home.homeDirectory}/Network/Midas/Files
+        M:${config.home.homeDirectory}/Network/Midas/Music
+        V:${config.home.homeDirectory}/Network/Midas/Videos
+        P:${config.home.homeDirectory}/Network/Midas/Photos
       '';
     };
     packages = with pkgsStable; [
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index eb7b803b..fda371e3 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -2,7 +2,7 @@
 {
   home.shellAliases = {
     # NixOS
-    nhs = "nh os switch /etc/nixos";
+    nhs = "nh os switch";
     nixclean = "nix store gc; nix store optimise";
     nixpurge = "doas nix-collect-garbage --delete-old";
 
diff --git a/modules/system/devices/disks/impermanence/main/default.nix b/modules/system/devices/disks/impermanence/main/default.nix
index 8db68972..1cf44809 100644
--- a/modules/system/devices/disks/impermanence/main/default.nix
+++ b/modules/system/devices/disks/impermanence/main/default.nix
@@ -5,6 +5,7 @@
     users.${config.sysusers.main} = {
       directories = [
         "Keepers"
+        "Projects"
         "Documents"
         "Pictures"
         "Videos"
@@ -22,14 +23,14 @@
         ".config/vesktop"
         ".config/zsh"
 
-        ".local/share/mpd"
-        ".local/share/nvim/undo"
         ".local/share/PrismLauncher"
         ".local/share/Steam"
         ".local/share/TelegramDesktop"
+        ".local/share/mpd"
+        ".local/share/nvim/undo"
 
-        ".local/state/wireplumber"
         ".local/state/lazygit"
+        ".local/state/wireplumber"
 
         ".cache/nix-index"
 
diff --git a/modules/system/devices/disks/impermanence/root/default.nix b/modules/system/devices/disks/impermanence/root/default.nix
index ca93701a..f3e539ff 100644
--- a/modules/system/devices/disks/impermanence/root/default.nix
+++ b/modules/system/devices/disks/impermanence/root/default.nix
@@ -3,13 +3,9 @@
   environment.persistence."/persist" = {
     hideMounts = true;
     directories = [
-      "/etc/nixos"
       "/storage"
       "/var/lib/nixos"
     ];
-    files = [
-      "/etc/machine-id"
-      "/root/.gitconfig"
-    ];
+    files = [ "/etc/machine-id" ];
   };
 }