feat: refactored impermanence to be enableable for users on a system

2025-10-13 09:36:48 -05:00 · 2025-10-13 09:36:48 -05:00 · 6d5a07e08f
commit 6d5a07e08f
parent 337f03b4e7
31 changed files with 61 additions and 56 deletions
--- a/configurations/home-manager/leyla/impermanence.nix
+++ b/configurations/home-manager/leyla/impermanence.nix
@ -1,10 +1,9 @@
 {
  lib,
  config,
-  osConfig,
  ...
 }: {
-  config = lib.mkIf osConfig.host.impermanence.enable {
+  config = lib.mkIf (config.impermanence.enable) {
    home.persistence."/persist/home/leyla" = {
      directories = [
        "desktop"
--- a/modules/home-manager-modules/default.nix
+++ b/modules/home-manager-modules/default.nix
@ -5,6 +5,7 @@
    ./user.nix
    ./flipperzero.nix
    ./i18n.nix
+    ./impermanence.nix
    ./openssh.nix
    ./gnome.nix
    ./programs
--- a/modules/home-manager-modules/impermanence.nix
+++ b/modules/home-manager-modules/impermanence.nix
@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  osConfig,
+  ...
+}: let
+  cfg = config.impermanence;
+in {
+  options.impermanence = {
+    enable = lib.mkEnableOption "impermanence for home directory";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.impermanence.enable {
+      assertions = [
+        {
+          assertion = osConfig.impermanence.enable;
+          message = "impermanence can not be enabled for a user when it is not enabled for a configuration";
+        }
+      ];
+    })
+    (lib.mkIf osConfig.host.impermanence.enable {
+      # If impermanence is not enabled for this user but system impermanence is enabled,
+      # persist the entire home directory as fallback
+      home.persistence."/persist/home/${config.home.username}" = lib.mkIf (!cfg.enable) {
+        directories = ["."];
+        allowOther = true;
+      };
+    })
+  ];
+}
--- a/modules/home-manager-modules/openssh.nix
+++ b/modules/home-manager-modules/openssh.nix
@ -95,7 +95,7 @@
          );
        }
      )
-      (lib.mkIf osConfig.host.impermanence.enable {
+      (lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          files = lib.lists.flatten (
            builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys
--- a/modules/home-manager-modules/programs/bitwarden.nix
+++ b/modules/home-manager-modules/programs/bitwarden.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.bitwarden = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/Bitwarden"
--- a/modules/home-manager-modules/programs/bruno.nix
+++ b/modules/home-manager-modules/programs/bruno.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.bruno = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/bruno/"
--- a/modules/home-manager-modules/programs/calibre.nix
+++ b/modules/home-manager-modules/programs/calibre.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.calibre = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/calibre"
--- a/modules/home-manager-modules/programs/davinci-resolve.nix
+++ b/modules/home-manager-modules/programs/davinci-resolve.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.davinci-resolve = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.dataHome}/DaVinciResolve"
--- a/modules/home-manager-modules/programs/dbeaver.nix
+++ b/modules/home-manager-modules/programs/dbeaver.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.dbeaver-bin = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.dataHome}/DBeaverData/"
--- a/modules/home-manager-modules/programs/discord.nix
+++ b/modules/home-manager-modules/programs/discord.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.discord = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/discord/"
--- a/modules/home-manager-modules/programs/firefox.nix
+++ b/modules/home-manager-modules/programs/firefox.nix
@ -1,7 +1,6 @@
 {
  lib,
  config,
-  osConfig,
  ...
 }: let
  buildProfilePersistence = profile: {
@ -26,7 +25,7 @@
    allowOther = true;
  };
 in {
-  config = lib.mkIf (config.programs.firefox.enable && osConfig.host.impermanence.enable) {
+  config = lib.mkIf (config.programs.firefox.enable && config.impermanence.enable) {
    home.persistence."/persist${config.home.homeDirectory}" = lib.mkMerge (
      (
        lib.attrsets.mapAttrsToList
--- a/modules/home-manager-modules/programs/freecad.nix
+++ b/modules/home-manager-modules/programs/freecad.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.freecad = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/FreeCAD"
--- a/modules/home-manager-modules/programs/gimp.nix
+++ b/modules/home-manager-modules/programs/gimp.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.gimp = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          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 osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            # configuration
--- a/modules/home-manager-modules/programs/inkscape.nix
+++ b/modules/home-manager-modules/programs/inkscape.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.inkscape = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/inkscape"
--- a/modules/home-manager-modules/programs/krita.nix
+++ b/modules/home-manager-modules/programs/krita.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.krita = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/kritarc"
--- a/modules/home-manager-modules/programs/libreoffice.nix
+++ b/modules/home-manager-modules/programs/libreoffice.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.libreoffice = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/libreoffice"
--- a/modules/home-manager-modules/programs/makemkv.nix
+++ b/modules/home-manager-modules/programs/makemkv.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.makemkv = {
@ -30,7 +29,7 @@
      home.file.".MakeMKV/settings.conf".source = config.lib.file.mkOutOfStoreSymlink config.sops.templates."MakeMKV.settings.conf".path;
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            ".MakeMKV"
--- a/modules/home-manager-modules/programs/obs.nix
+++ b/modules/home-manager-modules/programs/obs.nix
@ -1,12 +1,11 @@
 {
  lib,
  config,
-  osConfig,
  ...
 }: {
  config = lib.mkIf config.programs.obs-studio.enable (lib.mkMerge [
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        # TODO: map impermanence for obs
      }
    )
--- a/modules/home-manager-modules/programs/obsidian.nix
+++ b/modules/home-manager-modules/programs/obsidian.nix
@ -1,12 +1,11 @@
 {
  lib,
  config,
-  osConfig,
  ...
 }: {
  config = lib.mkIf config.programs.obsidian.enable (lib.mkMerge [
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/obsidian"
--- a/modules/home-manager-modules/programs/picard.nix
+++ b/modules/home-manager-modules/programs/picard.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.picard = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/MusicBrainz"
--- a/modules/home-manager-modules/programs/polycule.nix
+++ b/modules/home-manager-modules/programs/polycule.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.polycule = {
@ -17,7 +16,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          # TODO: check that these are actually the correct folders
          # directories = [
--- a/modules/home-manager-modules/programs/prostudiomasters.nix
+++ b/modules/home-manager-modules/programs/prostudiomasters.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.prostudiomasters = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/ProStudioMasters"
--- a/modules/home-manager-modules/programs/protonvpn.nix
+++ b/modules/home-manager-modules/programs/protonvpn.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.protonvpn-gui = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/protonvpn"
--- a/modules/home-manager-modules/programs/qbittorrent.nix
+++ b/modules/home-manager-modules/programs/qbittorrent.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.qbittorrent = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/qBittorrent"
--- a/modules/home-manager-modules/programs/qflipper.nix
+++ b/modules/home-manager-modules/programs/qflipper.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.qflipper = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/qFlipper"
--- a/modules/home-manager-modules/programs/signal.nix
+++ b/modules/home-manager-modules/programs/signal.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.signal-desktop-bin = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/Signal"
--- a/modules/home-manager-modules/programs/steam.nix
+++ b/modules/home-manager-modules/programs/steam.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.steam = {
@ -18,7 +17,7 @@
        ];
      }
      (
-        lib.mkIf osConfig.host.impermanence.enable {
+        lib.mkIf config.impermanence.enable {
          home.persistence."/persist${config.home.homeDirectory}" = {
            directories = [
              {
--- a/modules/home-manager-modules/programs/tor-browser.nix
+++ b/modules/home-manager-modules/programs/tor-browser.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.tor-browser = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.dataHome}/torbrowser"
--- a/modules/home-manager-modules/programs/ungoogled-chromium.nix
+++ b/modules/home-manager-modules/programs/ungoogled-chromium.nix
@ -2,7 +2,6 @@
  lib,
  pkgs,
  config,
-  osConfig,
  ...
 }: {
  options.programs.ungoogled-chromium = {
@ -16,7 +15,7 @@
      ];
    }
    (
-      lib.mkIf osConfig.host.impermanence.enable {
+      lib.mkIf config.impermanence.enable {
        home.persistence."/persist${config.home.homeDirectory}" = {
          directories = [
            "${config.xdg.configHome}/chromium"
--- a/modules/nixos-modules/server/panoramax/impermanence.nix
+++ b/modules/nixos-modules/server/panoramax/impermanence.nix
@ -1,10 +1,9 @@
 {
  lib,
  config,
-  osConfig,
  ...
 }: {
-  config = lib.mkIf (config.services.panoramax.enable && osConfig.host.impermanence.enable) {
+  config = lib.mkIf (config.services.panoramax.enable && config.host.impermanence.enable) {
    # TODO: configure impermanence for panoramax data
    # This would typically include directories like:
    # - /var/lib/panoramax