diff --git a/machines/buna/disko.nix b/machines/buna/disko.nix
index 1c93b0b..5bf9661 100644
--- a/machines/buna/disko.nix
+++ b/machines/buna/disko.nix
@@ -14,8 +14,6 @@ in
     };
   };
 
-  boot.zfs.forceImportRoot = true;
-
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {
@@ -25,65 +23,31 @@ in
           type = "gpt";
           partitions = {
             ESP = {
-              size = "1G";
+              end = "500M";
               type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
+                mountOptions = [ "umask=0077" ];
               };
             };
-            system = {
-              size = "100%";
+            root = {
+              name = "root";
+              end = "-0";
               content = {
-                type = "zfs";
-                pool = "zroot";
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/";
+                extraArgs = [
+                  "-O"
+                  "extra_attr,inode_checksum,sb_checksum,compression"
+                ];
+                mountOptions = [
+                  "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard"
+                ];
               };
             };
-            swap = {
-              size = "4G";
-              content = {
-                type = "swap";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "lz4";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options.ashift = "12";
-        datasets = {
-          "root" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "root/nixos" = {
-            type = "zfs_fs";
-            options.mountpoint = "/";
-            mountpoint = "/";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "/home";
-            mountpoint = "/home";
-          };
-          "root/tmp" = {
-            type = "zfs_fs";
-            mountpoint = "/tmp";
-            options = {
-              mountpoint = "/tmp";
-              sync = "disabled";
-            };
           };
         };
       };