diff --git a/configurations/home-manager/leyla/impermanence.nix b/configurations/home-manager/leyla/impermanence.nix
index 4a58cbb..8fbff41 100644
--- a/configurations/home-manager/leyla/impermanence.nix
+++ b/configurations/home-manager/leyla/impermanence.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   config = lib.mkIf (config.impermanence.enable) {
-    home.persistence."/persist/replicate/home" = {
+    home.persistence."${config.impermanence.persistencePath}" = {
       directories = [
         "desktop"
         "downloads"
diff --git a/modules/home-manager-modules/impermanence.nix b/modules/home-manager-modules/impermanence.nix
index fcc130d..e8b3ec4 100644
--- a/modules/home-manager-modules/impermanence.nix
+++ b/modules/home-manager-modules/impermanence.nix
@@ -12,6 +12,14 @@ in {
       type = lib.types.bool;
       default = true;
     };
+    persistencePath = lib.mkOption {
+      type = lib.types.str;
+      default =
+        if osConfig.storage.generateBase
+        then "/persist/replicate/home"
+        else "/persist";
+      description = "The base path for user home persistence. The impermanence module will automatically append the user's home directory path. Automatically adapts based on whether the system uses the new dataset layout or the legacy one.";
+    };
   };
 
   config = lib.mkMerge [
@@ -26,11 +34,7 @@ in {
     # If impermanence is not enabled for this user but system impermanence is enabled,
     # persist the entire home directory as fallback
     (lib.mkIf (osConfig.storage.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) {
-      home.persistence."${
-        if osConfig.storage.generateBase
-        then "/persist/replicate/home"
-        else "/persist/home/${config.home.username}"
-      }" = {
+      home.persistence."${cfg.persistencePath}" = {
         directories = ["."];
         allowOther = true;
       };
diff --git a/modules/home-manager-modules/openssh.nix b/modules/home-manager-modules/openssh.nix
index cbe7d8d..2f44957 100644
--- a/modules/home-manager-modules/openssh.nix
+++ b/modules/home-manager-modules/openssh.nix
@@ -96,7 +96,7 @@
         }
       )
       (lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           files = lib.lists.flatten (
             builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys
           );
diff --git a/modules/home-manager-modules/programs/android-studio.nix b/modules/home-manager-modules/programs/android-studio.nix
index 7c60e6e..8d1e28c 100644
--- a/modules/home-manager-modules/programs/android-studio.nix
+++ b/modules/home-manager-modules/programs/android-studio.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/Google/AndroidStudio"
             ".android"
diff --git a/modules/home-manager-modules/programs/anki.nix b/modules/home-manager-modules/programs/anki.nix
index c54feac..dcabce8 100644
--- a/modules/home-manager-modules/programs/anki.nix
+++ b/modules/home-manager-modules/programs/anki.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   config = lib.mkIf (config.programs.anki.enable && config.impermanence.enable) {
-    home.persistence."/persist/replicate/home" = {
+    home.persistence."${config.impermanence.persistencePath}" = {
       directories = [
         ".local/share/Anki2"
       ];
diff --git a/modules/home-manager-modules/programs/bitwarden.nix b/modules/home-manager-modules/programs/bitwarden.nix
index ade24b6..bbd2086 100644
--- a/modules/home-manager-modules/programs/bitwarden.nix
+++ b/modules/home-manager-modules/programs/bitwarden.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/Bitwarden"
           ];
diff --git a/modules/home-manager-modules/programs/bruno.nix b/modules/home-manager-modules/programs/bruno.nix
index ced1998..7bc64b6 100644
--- a/modules/home-manager-modules/programs/bruno.nix
+++ b/modules/home-manager-modules/programs/bruno.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/bruno/"
           ];
diff --git a/modules/home-manager-modules/programs/calibre.nix b/modules/home-manager-modules/programs/calibre.nix
index f41ced7..7174b43 100644
--- a/modules/home-manager-modules/programs/calibre.nix
+++ b/modules/home-manager-modules/programs/calibre.nix
@@ -12,7 +12,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/calibre"
           ];
diff --git a/modules/home-manager-modules/programs/davinci-resolve.nix b/modules/home-manager-modules/programs/davinci-resolve.nix
index c17c8b0..5956578 100644
--- a/modules/home-manager-modules/programs/davinci-resolve.nix
+++ b/modules/home-manager-modules/programs/davinci-resolve.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.dataHome}/DaVinciResolve"
             "${config.xdg.configHome}/blackmagic"
diff --git a/modules/home-manager-modules/programs/dbeaver.nix b/modules/home-manager-modules/programs/dbeaver.nix
index f509646..1595a02 100644
--- a/modules/home-manager-modules/programs/dbeaver.nix
+++ b/modules/home-manager-modules/programs/dbeaver.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.dataHome}/DBeaverData/"
           ];
diff --git a/modules/home-manager-modules/programs/discord.nix b/modules/home-manager-modules/programs/discord.nix
index 0b0588e..e42367b 100644
--- a/modules/home-manager-modules/programs/discord.nix
+++ b/modules/home-manager-modules/programs/discord.nix
@@ -6,7 +6,7 @@
   config = lib.mkIf config.programs.discord.enable (lib.mkMerge [
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/discord/"
           ];
diff --git a/modules/home-manager-modules/programs/firefox.nix b/modules/home-manager-modules/programs/firefox.nix
index e100200..2756e31 100644
--- a/modules/home-manager-modules/programs/firefox.nix
+++ b/modules/home-manager-modules/programs/firefox.nix
@@ -25,7 +25,7 @@
   };
 in {
   config = lib.mkIf (config.programs.firefox.enable && config.impermanence.enable) {
-    home.persistence."/persist/replicate/home" = lib.mkMerge (
+    home.persistence."${config.impermanence.persistencePath}" = lib.mkMerge (
       (
         lib.attrsets.mapAttrsToList
         (profile: _: buildProfilePersistence profile)
diff --git a/modules/home-manager-modules/programs/freecad.nix b/modules/home-manager-modules/programs/freecad.nix
index 19e08fa..50600db 100644
--- a/modules/home-manager-modules/programs/freecad.nix
+++ b/modules/home-manager-modules/programs/freecad.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/FreeCAD"
           ];
diff --git a/modules/home-manager-modules/programs/gimp.nix b/modules/home-manager-modules/programs/gimp.nix
index fbe4471..95c87e6 100644
--- a/modules/home-manager-modules/programs/gimp.nix
+++ b/modules/home-manager-modules/programs/gimp.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/GIMP"
           ];
diff --git a/modules/home-manager-modules/programs/idea.nix b/modules/home-manager-modules/programs/idea.nix
index b195096..a1aebda 100644
--- a/modules/home-manager-modules/programs/idea.nix
+++ b/modules/home-manager-modules/programs/idea.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             # configuration
             "${config.xdg.configHome}/JetBrains/"
diff --git a/modules/home-manager-modules/programs/inkscape.nix b/modules/home-manager-modules/programs/inkscape.nix
index 67e5f80..28eb334 100644
--- a/modules/home-manager-modules/programs/inkscape.nix
+++ b/modules/home-manager-modules/programs/inkscape.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/inkscape"
           ];
diff --git a/modules/home-manager-modules/programs/kdenlive.nix b/modules/home-manager-modules/programs/kdenlive.nix
index 2bec5b3..2c4bac8 100644
--- a/modules/home-manager-modules/programs/kdenlive.nix
+++ b/modules/home-manager-modules/programs/kdenlive.nix
@@ -23,7 +23,7 @@ in {
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/kdenliverc"
             "${config.xdg.dataHome}/kdenlive"
diff --git a/modules/home-manager-modules/programs/krita.nix b/modules/home-manager-modules/programs/krita.nix
index 88d1de9..dd7bb12 100644
--- a/modules/home-manager-modules/programs/krita.nix
+++ b/modules/home-manager-modules/programs/krita.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/kritarc"
             "${config.xdg.dataHome}/krita"
diff --git a/modules/home-manager-modules/programs/libreoffice.nix b/modules/home-manager-modules/programs/libreoffice.nix
index 9c3537f..283c8db 100644
--- a/modules/home-manager-modules/programs/libreoffice.nix
+++ b/modules/home-manager-modules/programs/libreoffice.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/libreoffice"
           ];
diff --git a/modules/home-manager-modules/programs/makemkv.nix b/modules/home-manager-modules/programs/makemkv.nix
index 9fcde8b..f748f68 100644
--- a/modules/home-manager-modules/programs/makemkv.nix
+++ b/modules/home-manager-modules/programs/makemkv.nix
@@ -30,7 +30,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             ".MakeMKV"
           ];
diff --git a/modules/home-manager-modules/programs/mapillary-uploader.nix b/modules/home-manager-modules/programs/mapillary-uploader.nix
index 09894c9..0d9ad5f 100644
--- a/modules/home-manager-modules/programs/mapillary-uploader.nix
+++ b/modules/home-manager-modules/programs/mapillary-uploader.nix
@@ -17,7 +17,7 @@ in {
     }
     (
       mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/mapillary-uploader"
             "${config.xdg.dataHome}/mapillary-uploader"
diff --git a/modules/home-manager-modules/programs/obs.nix b/modules/home-manager-modules/programs/obs.nix
index 3a099f7..0a4caf7 100644
--- a/modules/home-manager-modules/programs/obs.nix
+++ b/modules/home-manager-modules/programs/obs.nix
@@ -6,7 +6,7 @@
   config = lib.mkIf config.programs.obs-studio.enable (lib.mkMerge [
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/obs-studio"
           ];
diff --git a/modules/home-manager-modules/programs/obsidian.nix b/modules/home-manager-modules/programs/obsidian.nix
index e07beab..6676ecd 100644
--- a/modules/home-manager-modules/programs/obsidian.nix
+++ b/modules/home-manager-modules/programs/obsidian.nix
@@ -6,7 +6,7 @@
   config = lib.mkIf config.programs.obsidian.enable (lib.mkMerge [
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/obsidian"
           ];
diff --git a/modules/home-manager-modules/programs/olympus.nix b/modules/home-manager-modules/programs/olympus.nix
index 3223d62..2d5adb6 100644
--- a/modules/home-manager-modules/programs/olympus.nix
+++ b/modules/home-manager-modules/programs/olympus.nix
@@ -23,7 +23,7 @@ in {
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/olympus"
             "${config.xdg.dataHome}/olympus"
diff --git a/modules/home-manager-modules/programs/openrgb.nix b/modules/home-manager-modules/programs/openrgb.nix
index 64d6229..c350b1e 100644
--- a/modules/home-manager-modules/programs/openrgb.nix
+++ b/modules/home-manager-modules/programs/openrgb.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/OpenRGB"
           ];
diff --git a/modules/home-manager-modules/programs/picard.nix b/modules/home-manager-modules/programs/picard.nix
index 5d197f8..ffc4289 100644
--- a/modules/home-manager-modules/programs/picard.nix
+++ b/modules/home-manager-modules/programs/picard.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/MusicBrainz"
           ];
diff --git a/modules/home-manager-modules/programs/prostudiomasters.nix b/modules/home-manager-modules/programs/prostudiomasters.nix
index 5256f26..d61b7e5 100644
--- a/modules/home-manager-modules/programs/prostudiomasters.nix
+++ b/modules/home-manager-modules/programs/prostudiomasters.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/ProStudioMasters"
           ];
diff --git a/modules/home-manager-modules/programs/protonvpn.nix b/modules/home-manager-modules/programs/protonvpn.nix
index 57e50ab..5742948 100644
--- a/modules/home-manager-modules/programs/protonvpn.nix
+++ b/modules/home-manager-modules/programs/protonvpn.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/protonvpn"
             "${config.xdg.configHome}/Proton"
diff --git a/modules/home-manager-modules/programs/qbittorrent.nix b/modules/home-manager-modules/programs/qbittorrent.nix
index ee098e0..b2e0f50 100644
--- a/modules/home-manager-modules/programs/qbittorrent.nix
+++ b/modules/home-manager-modules/programs/qbittorrent.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/qBittorrent"
           ];
diff --git a/modules/home-manager-modules/programs/qflipper.nix b/modules/home-manager-modules/programs/qflipper.nix
index 0c7d242..bb141a4 100644
--- a/modules/home-manager-modules/programs/qflipper.nix
+++ b/modules/home-manager-modules/programs/qflipper.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/qFlipper"
           ];
diff --git a/modules/home-manager-modules/programs/signal.nix b/modules/home-manager-modules/programs/signal.nix
index bf5205e..a50a49e 100644
--- a/modules/home-manager-modules/programs/signal.nix
+++ b/modules/home-manager-modules/programs/signal.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/Signal"
           ];
diff --git a/modules/home-manager-modules/programs/steam.nix b/modules/home-manager-modules/programs/steam.nix
index 3dd6504..4e0644e 100644
--- a/modules/home-manager-modules/programs/steam.nix
+++ b/modules/home-manager-modules/programs/steam.nix
@@ -18,7 +18,7 @@
       }
       (
         lib.mkIf config.impermanence.enable {
-          home.persistence."/persist/replicate/home" = {
+          home.persistence."${config.impermanence.persistencePath}" = {
             directories = [
               {
                 directory = "${config.xdg.dataHome}/Steam";
diff --git a/modules/home-manager-modules/programs/tor-browser.nix b/modules/home-manager-modules/programs/tor-browser.nix
index 92484ae..c108805 100644
--- a/modules/home-manager-modules/programs/tor-browser.nix
+++ b/modules/home-manager-modules/programs/tor-browser.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.dataHome}/torbrowser"
           ];
diff --git a/modules/home-manager-modules/programs/ungoogled-chromium.nix b/modules/home-manager-modules/programs/ungoogled-chromium.nix
index e76eeeb..32f4b40 100644
--- a/modules/home-manager-modules/programs/ungoogled-chromium.nix
+++ b/modules/home-manager-modules/programs/ungoogled-chromium.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/chromium"
           ];
diff --git a/modules/home-manager-modules/programs/via.nix b/modules/home-manager-modules/programs/via.nix
index 3a638aa..ad6f45a 100644
--- a/modules/home-manager-modules/programs/via.nix
+++ b/modules/home-manager-modules/programs/via.nix
@@ -16,7 +16,7 @@
     }
     (
       lib.mkIf config.impermanence.enable {
-        home.persistence."/persist/replicate/home" = {
+        home.persistence."${config.impermanence.persistencePath}" = {
           directories = [
             "${config.xdg.configHome}/via"
             "${config.xdg.dataHome}/via"
diff --git a/modules/home-manager-modules/programs/vmware-workstation.nix b/modules/home-manager-modules/programs/vmware-workstation.nix
index 277e4bd..76f260b 100644
--- a/modules/home-manager-modules/programs/vmware-workstation.nix
+++ b/modules/home-manager-modules/programs/vmware-workstation.nix
@@ -17,7 +17,7 @@
       }
       (
         lib.mkIf config.impermanence.enable {
-          home.persistence."/persist/replicate/home" = {
+          home.persistence."${config.impermanence.persistencePath}" = {
             directories = [
               {
                 directory = ".vmware";