1 files changed, 5 insertions, 29 deletions

diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index ba304e22..8cbb51ef 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -1,7 +1,7 @@
 { flake, pkgs, ... }:
 {
   imports = with flake.nixosModules.systemProfiles; [
-    qemu-guest openssh rebuild-machines
+    qemu-guest openssh rebuild-machines ./zfs.nix
   ];
 
   config = {
@@ -24,7 +24,10 @@
       tmpOnTmpfs = true;
 
       supportedFilesystems = [ "zfs" ];
-      zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
+      zfs = {
+        enableUnstable = true;
+        devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
+      };
     };
 
     fileSystems = {
@@ -37,33 +40,6 @@
         { device = "/dev/disk/by-label/boot";
           fsType = "vfat";
         };
-
-      "/nix" =
-        { device = "surtr/local/nix";
-          fsType = "zfs";
-        };
-
-      "/root" =
-        { device = "surtr/safe/home-root";
-          fsType = "zfs";
-          neededForBoot = true;
-        };
-
-      "/var/lib/systemd" =
-        { device = "surtr/local/var-lib-systemd";
-          fsType = "zfs";
-          neededForBoot = true;
-        };
-
-      "/var/log" =
-        { device = "surtr/local/var-log";
-          fsType = "zfs";
-        };
-
-      "/home" =
-        { device = "surtr/safe/home";
-          fsType = "zfs";
-        };
     };
 
     networking = {