diff --git a/disko/default.nix b/disko/default.nix
index f12d487..fae8a8e 100644
--- a/disko/default.nix
+++ b/disko/default.nix
@@ -18,7 +18,7 @@
   };
 in {
   standardWithHibernateSwap = {
-    disks ? ["/dev/sda"],
+    disk,
     swapSize,
     ...
   }: {
@@ -33,7 +33,7 @@ in {
       disk = {
         primary = {
           type = "disk";
-          device = builtins.elemAt disks 0;
+          device = disk;
           content = {
             type = "gpt";
             partitions = {
@@ -73,14 +73,15 @@ in {
                   content = {
                     type = "btrfs";
                     extraArgs = ["-f"];
+                    mountpoint = "/partition-root";
                     subvolumes = {
-                      "/nixos" = {
-                        mountpoint = "/";
-                        mountOptions = ["compress=zstd" "noatime"];
+                      "/rootfs" = {
+                        mountpoint = "/rootfs";
+                        mountOptions = ["compress=zstd"];
                       };
                       "/home" = {
                         mountpoint = "/home";
-                        mountOptions = ["compress=zstd" "noatime"];
+                        mountOptions = ["compress=zstd"];
                       };
                       "/nix" = {
                         mountpoint = "/nix";
@@ -110,7 +111,7 @@ in {
               ESP = {
                 label = "EFI";
                 name = "ESP";
-                size = "512M";
+                size = "4G";
                 type = "EF00";
                 content = {
                   type = "filesystem";
@@ -135,14 +136,15 @@ in {
                   content = {
                     type = "btrfs";
                     extraArgs = ["-f"];
+                    mountpoint = "/partition-root";
                     subvolumes = {
                       "/root" = {
                         mountpoint = "/";
-                        mountOptions = ["compress=zstd" "noatime"];
+                        mountOptions = ["compress=zstd"];
                       };
                       "/home" = {
                         mountpoint = "/home";
-                        mountOptions = ["compress=zstd" "noatime"];
+                        mountOptions = ["compress=zstd"];
                       };
                       "/nix" = {
                         mountpoint = "/nix";
@@ -178,7 +180,7 @@ in {
                   subvolumes = {
                     "/rootfs" = {
                       mountpoint = "/";
-                      mountOptions = [];
+                      mountOptions = ["compress=zstd"];
                     };
                     "/home" = {
                       mountpoint = "/home";
@@ -394,7 +396,7 @@ in {
       };
     };
   };
-  legacy = {disks ? ["/dev/vda"], ...}: {
+  legacy = {disks, ...}: {
     disko.devices = {
       disk = {
         primary = {
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 53e0e26..3bdd03b 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -337,7 +337,7 @@ in
         ];
         # See https://wiki.hyprland.org/Configuring/Keywords/ for more
         monitor = [
-          "eDP-1,2880x1920@120Hz,0x0,1.66667"
+          "eDP-1,2880x1920@120Hz,0x0,1.5"
         ];
       };
     };