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

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"

modules/home-manager-modules/default.nix

@@ -5,6 +5,7 @@
     ./user.nix
     ./flipperzero.nix
     ./i18n.nix
+    ./impermanence.nix
     ./openssh.nix
     ./gnome.nix
     ./programs

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;
+      };
+    })
+  ];
+}

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

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"

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/"

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"

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"

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/"

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/"

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

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"

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"

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

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"

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"

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"

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"

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
       }
     )

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"

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"

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 = [

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"

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"

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"

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"

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"

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 = [
               {

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"

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"

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