diff --git a/home/modules/fish/default.nix b/home/modules/fish/default.nix
index 47f91d56..1ec140a8 100644
--- a/home/modules/fish/default.nix
+++ b/home/modules/fish/default.nix
@@ -138,7 +138,7 @@ in {
             b = "z -"; # jump to previous dir
             mkdir = "mkdir -p"; # also create parents (-p)
             blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
-            blkid = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
+            blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
             watch = "watch -d -c -n 0.5";
             nd = "nix develop";
             nb = "nix build -L";
diff --git a/system/modules/default.nix b/system/modules/default.nix
index ee10dc91..2ceb4e2f 100644
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -4,6 +4,7 @@
     ./desktopportal
     ./docker
     ./fonts
+    ./impermanence
     ./mime
     ./network
     ./polkit
diff --git a/system/modules/impermanence/default.nix b/system/modules/impermanence/default.nix
new file mode 100644
index 00000000..4d34be08
--- /dev/null
+++ b/system/modules/impermanence/default.nix
@@ -0,0 +1,113 @@
+{
+  config,
+  lib,
+  mylib,
+  username,
+  ...
+}: let
+  inherit (config.modules) impermanence;
+in {
+  options.modules.impermanence = import ./options.nix {inherit lib mylib;};
+
+  config = let
+    # NOTE: Setting user/group/mode only has an effect if the
+    #       directory is created by impermanence!
+    m755 = "u=rwx,g=rx,o=rx";
+    m711 = "u=rwx,g=x,o=x";
+    m700 = "u=rwx,g=,o=";
+    m644 = "u=rw,g=r,o=r";
+    m600 = "u=rw,g=,o=";
+    m444 = "u=r,g=r,o=r";
+
+    mkDir = user: directory: mode: {
+      inherit directory mode;
+      user = config.users.users.${user}.name;
+      group = config.users.users.${user}.group;
+    };
+
+    mkFile = user: file: mode: {
+      inherit file;
+      parentDirectory = {
+        inherit mode;
+        user = config.users.users.${user}.name;
+        group = config.users.users.${user}.group;
+      };
+    };
+  in
+    lib.mkIf impermanence.enable {
+      environment.persistence."/persist" = let
+        mkRDir = mkDir "root";
+        mkRFile = mkFile "root";
+        mkUDir = mkDir "${username}";
+        mkUFile = mkFile "${username}";
+      in {
+        hideMounts = true; # Sets x-gvfs-hide option
+
+        files = [
+          (mkRFile "/etc/adjtime" m644)
+          (mkRFile "/etc/machine-id" m444)
+        ];
+
+        directories = [
+          (mkRDir "/etc/NetworkManager" m755)
+          (mkRDir "/etc/ssh" m755)
+
+          (mkRDir "/var/db/sudo" m711)
+
+          (mkRDir "/var/lib/bluetooth" m755) # m700
+          (mkRDir "/var/lib/containers" m755)
+          (mkRDir "/var/lib/flatpak" m755)
+          (mkRDir "/var/lib/NetworkManager" m755)
+          (mkRDir "/var/lib/nixos" m755)
+          (mkRDir "/var/lib/systemd" m755)
+        ];
+
+        users.${username} = {
+          files = [
+            (mkUFile ".ssh/known_hosts" m755) # m644
+
+            (mkUFile ".secrets/spotify_client_id" m755) # m644
+            (mkUFile ".secrets/spotify_client_secret" m755) # m644
+            (mkUFile ".secrets/youtube_music_cookies" m755) # m644
+            (mkUFile ".secrets/age/age.key" m755) # m600
+          ];
+
+          directories = [
+            (mkUDir "Downloads" m755)
+            (mkUDir "Documents" m755)
+            (mkUDir "GitRepos" m755)
+            (mkUDir "NixFlake" m755)
+            (mkUDir "Notes" m755)
+            (mkUDir "Pictures" m755)
+            (mkUDir "Projects" m755)
+            (mkUDir "Public" m755)
+            (mkUDir "Unity" m755)
+            (mkUDir "Videos" m755)
+
+            (mkUDir ".gnupg" m755) # m600
+
+            (mkUDir ".mozilla/firefox" m755) # TODO: Remove this someday
+            (mkUDir ".mozilla/native-messaging-hosts" m755)
+            (mkUDir ".ollama" m755)
+            (mkUDir ".var/app" m755)
+            (mkUDir ".vim/undo" m755)
+
+            (mkUDir ".cache/fish/generated_completions" m755)
+
+            (mkUDir ".config/Ferdium" m755)
+            (mkUDir ".config/fish/completions" m755)
+            (mkUDir ".config/kdeconnect" m755)
+            (mkUDir ".config/keepassxc" m755)
+            (mkUDir ".config/Msty" m755)
+            (mkUDir ".config/Nextcloud" m755)
+
+            (mkUDir ".local/share/flatpak" m755)
+            (mkUDir ".local/share/nix" m755)
+            (mkUDir ".local/share/nvim/sessions" m755)
+            (mkUDir ".local/share/zoxide" m755)
+            (mkUDir ".local/state/astal/notifd" m755)
+          ];
+        };
+      };
+    };
+}
diff --git a/system/modules/impermanence/options.nix b/system/modules/impermanence/options.nix
new file mode 100644
index 00000000..33f43db6
--- /dev/null
+++ b/system/modules/impermanence/options.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable opt-in state using impermanence.";
+
+  # TODO: Options for host-specific config
+}
diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index 84256b0b..8b4c1110 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -14,6 +14,8 @@
   ];
 
   modules = {
+    impermanence.enable = true;
+
     network = {
       useNetworkManager = true;