seperate root dataset again

devices/ellaca/default.nix

@@ -1,11 +1,13 @@
 { pkgs, ... }: {
   imports = [
     ./hardware-config.nix
+    ./disko.nix
     ./nvidia.nix
     ./options.nix
   ];
 
   networking.hostName = "ellaca";
+  networking.hostId = "656c6c61";
 
   # Select kernel version
   boot.kernelPackages = pkgs.linuxPackages_zen;
@@ -15,8 +17,9 @@
     grub = {
       enable = true;
       efiSupport = true;
-      device = "nodev";
+      efiInstallAsRemovable = true;
       useOSProber = true;
+      device = "nodev";
       font = null;
       splashImage = null;
     };
@@ -40,5 +43,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Did you read the comment?
 }

devices/ellaca/disko.nix

@@ -0,0 +1,100 @@
+{
+  disko.devices = {
+    disk = {
+      ssd0 = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "64M";
+              type = "EF00";
+              priority = 0;
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            zfs = {
+              end = "-16G";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+            swap = {
+              size = "100%";
+              content = {
+                type = "swap";
+                resumeDevice = true;
+              };
+            };
+          };
+        };
+      };
+      hdd0 = {
+        type = "disk";
+        device = "/dev/sda";
+        content = {
+          type = "gpt";
+          partitions = {
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zstore";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        mode = "";
+        rootFsOptions = {
+          compression = "zstd";
+          "com.sun:auto-snapshot" = "false";
+        };
+        postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
+
+        datasets = {
+          root = {
+            type = "zfs_fs";
+            mountpoint = "/";
+            options."com.sun:auto-snapshot" = "true";
+          };
+          nix = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options."com.sun:auto-snapshot" = "true";
+          };
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist";
+            options."com.sun:auto-snapshot" = "true";
+          };
+        };
+      };
+      zstore = {
+        type = "zpool";
+        mode = "";
+        rootFsOptions = {
+          compression = "zstd";
+          "com.sun:auto-snapshot" = "false";
+        };
+        postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
+
+        datasets = {
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist/ext";
+          };
+        };
+      };
+    };
+  };
+}

devices/ellaca/hardware-config.nix

@@ -1,30 +1,9 @@
-{ config, lib, modulesPath, ... }: {
+{ config, lib, ... }: {
-  imports = [ 
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = { 
-    device = "/dev/disk/by-uuid/95b15244-c97c-42a5-9be1-ed5df6872dcb";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/BF87-B3DE";
-    fsType = "vfat";
-  };
-
-  fileSystems."/ext" = {
-    device = "/dev/disk/by-uuid/31608388-1043-47a0-a5da-e92250e821f8";
-    fsType = "ext4";
-  };
-
-  swapDevices =[ { device = "/dev/disk/by-uuid/b6445ced-1cc2-461f-a81f-6e8409c10f48"; } ];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

flake.lock

@@ -98,6 +98,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714959124,
+        "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1696426674,
@@ -463,6 +483,7 @@
     },
     "root": {
       "inputs": {
+        "disko": "disko",
         "home-manager": "home-manager",
         "niri": "niri",
         "nixos-hardware": "nixos-hardware",

flake.nix

@@ -21,6 +21,11 @@
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs: import ./outputs.nix inputs;

outputs.nix

@@ -1,10 +1,11 @@
-{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }@inputs: {
+{ nixpkgs, home-manager, nixos-hardware, nur, niri, disko, ... }@inputs: {
   nixosConfigurations = let
 
     clientModules = [
         ./modules/system
         ./options.nix
         niri.nixosModules.niri
+        disko.nixosModules.disko
         home-manager.nixosModules.home-manager {
           nixpkgs.overlays = [
             nur.overlay