fix: fixed more datasets

2026-03-07 19:00:01 -06:00 · 2026-03-07 19:00:01 -06:00 · 16089e0371
commit 16089e0371
parent 2f7bbf3e1c
36 changed files with 44 additions and 40 deletions
--- 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"
--- 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;
      };
--- 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
          );
--- 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"
--- 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"
      ];
--- 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"
          ];
--- 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/"
          ];
--- 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"
          ];
--- 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"
--- 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/"
          ];
--- 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/"
          ];
--- 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)
--- 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"
          ];
--- 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"
          ];
--- 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/"
--- 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"
          ];
--- 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"
--- 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"
--- 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"
          ];
--- 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"
          ];
--- 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"
--- 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"
          ];
--- 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"
          ];
--- 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"
--- 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"
          ];
--- 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"
          ];
--- 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"
          ];
--- 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"
--- 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"
          ];
--- 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"
          ];
--- 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"
          ];
--- 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";
--- 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"
          ];
--- 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"
          ];
--- 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"
--- 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";