diff --git a/machines/sirius/configuration.nix b/machines/sirius/configuration.nix
index be135e7..4261ff4 100644
--- a/machines/sirius/configuration.nix
+++ b/machines/sirius/configuration.nix
@@ -17,4 +17,20 @@
 
   system.stateVersion = "25.11";
 
+  services.journald.extraConfig = ''
+    Storage=volatile
+    RuntimeMaxUse=30M
+    RuntimeMaxFileSize=10M
+  '';
+
+  services.udisks2.enable = false;
+
+  nix.settings.log-lines = 25;
+  nix.settings.auto-optimise-store = true;
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 15d";
+  };
+
 }
diff --git a/machines/sirius/disko.nix b/machines/sirius/disko.nix
index bebd60f..123ad8e 100644
--- a/machines/sirius/disko.nix
+++ b/machines/sirius/disko.nix
@@ -16,6 +16,7 @@ in
     efi = {
       canTouchEfiVariables = true;
     };
+    tmp.useTmpfs = true;
   };
 
   disko.devices = {
@@ -33,20 +34,24 @@ in
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = [ "nofail" ];
+                mountOptions = [
+                  "umask=0077"
+                  "nofail"
+                ];
               };
             };
-            system = {
+            root = {
+              name = "root";
               size = "100%";
               content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-            swap = {
-              size = "16G";
-              content = {
-                type = "swap";
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/";
+                extraArgs = [
+                  "-0"
+                  "extra_attr,inode_checksum,sb_checksum,compression"
+                ];
+                mountOptions = "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard";
               };
             };
           };
@@ -67,41 +72,6 @@ in
       }) vdev
     ));
     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";
-            };
-          };
-        };
-      };
       zdata = {
         type = "zpool";
         options.ashift = "12";