Move all the individual stored impermanence folders to specific files

modules/home/programs/gui/librewolf/default.nix

@@ -238,6 +238,9 @@
     };
 
     # Symlinks to Librewolf
-    home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
+    home = {
+      file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
+      persistence."/persist${config.home.homeDirectory}".directories = [ ".mozilla" ];
+    };
   };
 }

modules/home/programs/gui/obs/default.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
+  config = lib.mkIf config.home.production.enable {
     programs.obs-studio = {
-    enable = config.home.production.enable;
+      enable = true;
       plugins = with pkgs.obs-studio-plugins; [
         looking-glass-obs
         obs-multi-rtmp
@@ -11,4 +12,7 @@
         obs-webkitgtk
       ];
     };
+
+    home.persistence."/persist${config.home.homeDirectory}".directories = [ ".config/obs-studio" ];
+  };
 }

modules/home/programs/gui/thunderbird/default.nix

@@ -1,5 +1,6 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
+  config = lib.mkIf config.home.desktop.enable {
     programs.thunderbird = {
       enable = config.home.desktop.enable;
       profiles = {
@@ -57,4 +58,7 @@
         };
       };
     };
+
+    home.persistence."/persist${config.home.homeDirectory}".directories = [ ".thunderbird" ];
+  };
 }

modules/home/programs/misc/gaming/launchers/default.nix

@@ -1,14 +1,22 @@
 { config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; lib.mkIf config.home.gaming.enable [
+  config = lib.mkIf config.home.gaming.enable {
+    home.packages = with pkgs; [
       heroic
       prismlauncher
       steam
       steam-run-free
     ];
 
+    home.persistence."/persist${config.home.homeDirectory}".directories = [
+      ".config/heroic"
+      ".local/share/PrismLauncher"
+      ".local/share/Steam"
+    ];
+
     nixpkgs.allowUnfreePackages = [
       "steam"
       "steam-unwrapped"
     ];
+  };
 }

modules/home/programs/misc/general/default.nix

@@ -1,8 +1,11 @@
 { config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
+  home = lib.mkIf config.home.desktop.enable {
+    packages = with pkgs; [
       libreoffice
       qbittorrent
       vesktop
     ];
+    persistence."/persist${config.home.homeDirectory}".directories = [ ".config/vesktop" ];
+  };
 }

modules/home/programs/misc/production/default.nix

@@ -1,11 +1,17 @@
 { config, lib, pkgs, blender, ... }:
 {
-  config = lib.mkIf config.home.production.enable {
   nixpkgs.overlays = [ blender.overlays.default ];
-    home.packages = with pkgs; [
+
+  home = lib.mkIf config.home.production.enable {
+    packages = with pkgs; [
       audacity
       blender_4_4
       krita
     ];
+    persistence."/persist${config.home.homeDirectory}".directories = [
+      ".config/audacity"
+      ".config/blender"
+      ".local/share/krita"
+    ];
   };
 }

modules/home/programs/terminal/default.nix

@@ -7,6 +7,7 @@
     ./eza
     ./fastfetch
     ./git
+    ./lazygit
     ./ncmpcpp
     ./neovim
     ./nh

modules/home/programs/terminal/git/default.nix

@@ -7,10 +7,8 @@
     extraConfig.safe.directory = "/etc/nixos";
   };
   
-  programs.lazygit.enable = true;
-
   home.packages = with pkgs; [
-    gnupg
     git-crypt
+    gnupg
   ];
 }

modules/home/programs/terminal/lazygit/default.nix

@@ -0,0 +1,5 @@
+{ config, ... }:
+{
+  programs.lazygit.enable = true;
+  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/state/lazygit" ];
+}

modules/home/programs/terminal/neovim/default.nix

@@ -110,4 +110,6 @@
       nmap <C-a> :NERDTreeToggleVCS<CR>
     '';
   };
+
+  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/nvim/undo" ];
 }

modules/home/programs/terminal/nix-index/default.nix

@@ -1,4 +1,5 @@
-{ ... }:
+{ config, ... }:
 {
   programs.nix-index.enable = true;
+  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".cache/nix-index" ];
 }

modules/home/programs/terminal/zsh/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   programs.zsh = {
     enable = true;
@@ -25,4 +25,6 @@
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
     '';
   };
+
+  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".config/zsh" ];
 }

modules/home/services/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./easyeffects
     ./gnome-keyring
+    ./impermanence
     ./mpd
     ./playerctl
   ];

modules/home/services/impermanence/default.nix

@@ -0,0 +1,24 @@
+{ config, impermanence, ... }:
+{
+  imports = [ impermanence.homeManagerModules.impermanence ];
+
+  home.persistence."/persist${config.home.homeDirectory}" = {
+    directories = [
+      "Keepers"
+      "Projects"
+      "Documents"
+      "Pictures"
+      "Videos"
+      "Games"
+      "VMs"
+
+      ".ssh"
+      ".gnupg"
+
+      ".config/sunshine"
+      ".local/share/keyrings"
+      ".local/state/wireplumber"
+    ];
+    allowOther = false;
+  };
+}

modules/home/services/mpd/default.nix

@@ -1,6 +1,7 @@
 { config, lib, ... }:
 {
-  services = lib.mkIf config.home.desktop.enable {
+  config = lib.mkIf config.home.desktop.enable {
+    services = {
       mpd = {
         enable = true;
         network.startWhenNeeded = true;
@@ -16,4 +17,7 @@
       mpd-mpris.enable = true;
       mpd-discord-rpc.enable = true;
     };
+
+    home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/mpd" ];
+  };
 }

modules/system/devices/disks/impermanence/default.nix

@@ -1,8 +1,13 @@
 { impermanence, ... }:
 {
-  imports = [
-    ./main
-    ./root
-    impermanence.nixosModules.impermanence
+  imports = [ impermanence.nixosModules.impermanence ];
+
+  environment.persistence."/persist" = {
+    hideMounts = true;
+    directories = [
+      "/storage"
+      "/var/lib/nixos"
     ];
+    files = [ "/etc/machine-id" ];
+  };
 }

modules/system/devices/disks/impermanence/main/default.nix

@@ -1,43 +0,0 @@
-{ config, ... }:
-{
-  environment.persistence."/persist" = {
-    hideMounts = true;
-    users.${config.sysusers.main} = {
-      directories = [
-        "Keepers"
-        "Projects"
-        "Documents"
-        "Pictures"
-        "Videos"
-        "Games"
-        "VMs"
-
-        ".mozilla"
-        ".thunderbird"
-
-        ".config/blender"
-        ".config/dconf"
-        ".config/heroic"
-        ".config/obs-studio"
-        ".config/sunshine"
-        ".config/vesktop"
-        ".config/zsh"
-
-        ".local/share/PrismLauncher"
-        ".local/share/Steam"
-        ".local/share/TelegramDesktop"
-        ".local/share/mpd"
-        ".local/share/nvim/undo"
-
-        ".local/state/lazygit"
-        ".local/state/wireplumber"
-
-        ".cache/nix-index"
-
-        { directory = ".ssh"; mode = "0700"; }
-        { directory = ".gnupg"; mode = "0700"; }
-        { directory = ".local/share/keyrings"; mode = "0700"; }
-      ];
-    };
-  };
-}

modules/system/devices/disks/impermanence/root/default.nix

@@ -1,11 +0,0 @@
-{ ... }:
-{
-  environment.persistence."/persist" = {
-    hideMounts = true;
-    directories = [
-      "/storage"
-      "/var/lib/nixos"
-    ];
-    files = [ "/etc/machine-id" ];
-  };
-}

modules/system/programs/home-manager/default.nix

@@ -1,4 +1,4 @@
-{ hm, stable, unstable, nur, blender, ... }:
+{ hm, stable, unstable, blender, impermanence, nur, ... }:
 {
   imports = [ hm.nixosModules.home-manager ];
 
@@ -9,8 +9,9 @@
       inherit
         stable
         unstable
-        nur
         blender
+        impermanence
+        nur
         ;
     };
   };