update flake.lock; refactor impermanence; other minor fixes

2026-02-24 16:50:17 +08:00
parent 12c56e2283
commit 8c10af7f58
10 changed files with 159 additions and 169 deletions
@@ -31,13 +31,12 @@ in
  services.btrfs.autoScrub.enable = true;
  networking.hostId = "10ca95b4";

-  fileSystems."/" = {
+  my.persist.btrfs = {
    device = btrfs;
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=root"
-    ];
+    mountPoint = "/nix/persist";
+    persistSubvol = "persist";
+    rootSubvol = "root";
+    zstdCompress = true;
  };

  fileSystems."/nix" = {
@@ -49,17 +48,6 @@ in
    ];
  };

-  my.persist.location = "/nix/persist";
-  fileSystems."/nix/persist" = {
-    device = btrfs;
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=persist"
-    ];
-    neededForBoot = true;
-  };
-
  boot.initrd.postDeviceCommands = lib.mkAfter ''
    mkdir /btrfs_tmp
    mount ${btrfs} /btrfs_tmp