fix(planet/nixos/persistence): persist /var/lib/nixos

Needed to prevent UIDs and GIDs from being reassigned every boot.
dixslyf · Sep 1, 2024 · d1589be · d1589be
1 parent 99e6bd8
commit d1589be
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/planet/modules/nixos/persistence/default.nix b/planet/modules/nixos/persistence/default.nix
@@ -39,6 +39,15 @@
             Allow non-root users to specify the allow_other or allow_root mount options, see mount.fuse3(8).
           '';
         };
+        persistVarLibNixos = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to persist the `/var/lib/nixos` directory.
+            Needed to persist UIDs and GIDs.
+            This is more of a convenience option.
+          '';
+        };
         persistSystemdDirectories = mkOption {
           type = types.bool;
           default = false;
@@ -83,14 +92,6 @@
             This is more of a convenience option.
           '';
         };
-        directories = mkOption {
-          type = with types; listOf anything;
-          default = [ ];
-          description = ''
-            List of directories to persist.
-            This list will be passed to the corresponding option in the `impermanence` module.
-          '';
-        };
         persistMachineId = mkOption {
           type = types.bool;
           default = false;
@@ -99,6 +100,14 @@
             This is more of a convenience option.
           '';
         };
+        directories = mkOption {
+          type = with types; listOf anything;
+          default = [ ];
+          description = ''
+            List of directories to persist.
+            This list will be passed to the corresponding option in the `impermanence` module.
+          '';
+        };
         files = mkOption {
           type = with types; listOf anything;
           default = [ ];
@@ -134,6 +143,7 @@
           "/var/lib/systemd/coredump"
           "/var/lib/systemd/timers"
         ])
+          ++ (lists.optional cfg.persistVarLibNixos "/var/lib/nixos")
           ++ (lists.optionals cfg.persistMachines [ "/var/lib/machines" "/etc/systemd/nspawn" ])
           ++ (lists.optional cfg.persistSystemdBacklight "/var/lib/systemd/backlight") # for systemd-backlight to be able to restore brightness
           ++ (lists.optional cfg.persistLogs "/var/log")