From 8aa984a389b949ca4e0fad20c32af931341b2083 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 10 Nov 2025 15:49:12 -0600
Subject: [PATCH] feat: made datasets build

---
 .../nixos-modules/storage/impermanence.nix    | 10 +++++-
 modules/nixos-modules/storage/storage.nix     | 34 ++++++++++++-------
 .../submodules/impermanenceDataset.nix        |  4 +--
 modules/nixos-modules/users.nix               |  8 -----
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/modules/nixos-modules/storage/impermanence.nix b/modules/nixos-modules/storage/impermanence.nix
index 33b4706..4f231bf 100644
--- a/modules/nixos-modules/storage/impermanence.nix
+++ b/modules/nixos-modules/storage/impermanence.nix
@@ -80,6 +80,15 @@ in {
 
       programs.fuse.userAllowOther = true;
 
+      fileSystems =
+        lib.mapAttrs' (
+          datasetName: dataset:
+            lib.nameValuePair "/${datasetName}" {
+              neededForBoot = true;
+            }
+        )
+        config.storage.impermanence.datasets;
+
       environment.persistence =
         lib.mapAttrs (datasetName: dataset: {
           enable = true;
@@ -101,7 +110,6 @@ in {
           }) (lib.filterAttrs (_: fileConfig: fileConfig.enable) dataset.files);
         })
         config.storage.impermanence.datasets;
-      # TODO: need for boot on filesystems
     }
     (lib.mkIf config.storage.zfs.enable {
       storage.zfs.datasets =
diff --git a/modules/nixos-modules/storage/storage.nix b/modules/nixos-modules/storage/storage.nix
index d6a2a2b..e9f740b 100644
--- a/modules/nixos-modules/storage/storage.nix
+++ b/modules/nixos-modules/storage/storage.nix
@@ -35,17 +35,19 @@
           };
         }
         (lib.mkIf (!config.storage.impermanence.enable) {
-          # TODO: create datasets for systemd.services.<name>.storage.impermanence.datasets
-          storage.zfs.datasets = {
-            "persist/system/root" = {
-              type = "zfs_fs";
-              mount = {
-                enable = false;
-                mountPoint = "/";
-              };
-              snapshot = {
-                autoSnapshot = true;
-              };
+          storage.zfs.rootDataset = {
+            type = "zfs_fs";
+            mount = {
+              enable = true;
+              mountPoint = "/";
+            };
+            compression = "lz4";
+            acltype = "posixacl";
+            relatime = "on";
+            xattr = "sa";
+            snapshot = {
+              autoSnapshot = true;
+              blankSnapshot = true;
             };
           };
         })
@@ -70,8 +72,8 @@
           storage.impermanence.datasets = {
             "persist/system/root" = {
               mount = {
-                enable = false;
-                mountPoint = "/";
+                enable = true;
+                mountPoint = "/persist/system/root";
               };
               directories = {
                 "/var/lib/nixos".enable = true;
@@ -81,6 +83,12 @@
                 "/etc/machine-id".enable = true;
               };
             };
+            "persist/home" = {
+              mount = {
+                enable = true;
+                mountPoint = "/persist/home";
+              };
+            };
           };
 
           # TODO: home-manager.users.<user>.storage.impermanence.enable
diff --git a/modules/nixos-modules/storage/submodules/impermanenceDataset.nix b/modules/nixos-modules/storage/submodules/impermanenceDataset.nix
index 7154e90..0104b88 100644
--- a/modules/nixos-modules/storage/submodules/impermanenceDataset.nix
+++ b/modules/nixos-modules/storage/submodules/impermanenceDataset.nix
@@ -14,14 +14,14 @@ args @ {lib, ...}: {name, ...}: let
       owner = {
         name = lib.mkOption {
           type = lib.types.str;
-          default = "nouser";
+          default = "root";
         };
         permissions = pathPermissions;
       };
       group = {
         name = lib.mkOption {
           type = lib.types.str;
-          default = "nogroup";
+          default = "root";
         };
         permissions = pathPermissions;
       };
diff --git a/modules/nixos-modules/users.nix b/modules/nixos-modules/users.nix
index 040261a..bf45ac9 100644
--- a/modules/nixos-modules/users.nix
+++ b/modules/nixos-modules/users.nix
@@ -415,7 +415,6 @@ in {
                 relatime = "off";
               };
             }
-            # Create ZFS datasets for each normal user
             (lib.mkMerge (
               builtins.map (user: {
                 "local/home/${user.name}" = {
@@ -426,13 +425,6 @@ in {
                   };
                   snapshot.blankSnapshot = true;
                 };
-                "persist/home/${user.name}" = {
-                  type = "zfs_fs";
-                  mount = {
-                    enable = true;
-                    mountPoint = "/persist/home/${user.name}";
-                  };
-                };
               })
               normalUsers
             ))