diff --git a/configs/nixos/ni/disko.nix b/configs/nixos/ni/disko.nix
index 377f84e5..395cbbba 100644
--- a/configs/nixos/ni/disko.nix
+++ b/configs/nixos/ni/disko.nix
@@ -12,7 +12,7 @@
           ESP = {
             priority = 1;
             start = "0";
-            end = "128MiB";
+            end = "512MiB";
             type = "EF00";
             content = {
               type = "filesystem";
@@ -21,6 +21,16 @@
             };
           };
 
+          swap = {
+            start = "-8GiB";
+            end = "-0";
+            type = "8200";
+            content = {
+              type = "swap";
+              randomEncryption = true;
+            };
+          };
+
           root = {
             size = "100%";
             type = "8300";
@@ -39,18 +49,14 @@
                     mountpoint = "/home";
                   };
                   "/nix" = {
-                    mountOptions = [ "compress=zstd" "noatime" "noattr" "noacl" ];
+                    mountOptions = [ "compress=zstd" "noatime" "noacl" ];
                     mountpoint = "/nix";
                   };
-                  "/swap" = {
-                    mountpoint = "/.swapvol";
-                    swap.swapfile.size = "8G";
-                  };
                 }
 
                 (lib.mkIf config.services.guix.enable {
                   "/gnu" = {
-                    mountOptions = [ "compress=zstd" "noatime" "noattr" "noacl" ];
+                    mountOptions = [ "compress=zstd" "noatime" "noacl" ];
                     mountpoint = "/gnu";
                   };
                 })