...

1 files changed, 12 insertions, 19 deletions

diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index f3243d8..97e5c87 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -7,67 +7,60 @@
         content = {
           type = "gpt";
           partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
+            biosboot = {
+              size = "1M";
+              type = "EF02";
             };
             luks = {
               size = "100%";
               content = {
                 type = "luks";
                 name = "crypted";
-                settings = {
-                  allowDiscards = true;
-                };
+                settings.allowDiscards = true;
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f" ];
+                  extraArgs = ["-f"];
                   subvolumes = {
-                    "@" = {
+                    "root" = {
                       mountpoint = "/";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@home" = {
+                    "home" = {
                       mountpoint = "/home";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@nix" = {
+                    "nix" = {
                       mountpoint = "/nix";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@log" = {
+                    "log" = {
                       mountpoint = "/var/log";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@vms" = {
+                    "vms" = {
                       mountpoint = "/vms";
                       mountOptions = [
                         "nodatacow"
                         "noatime"
                       ];
                     };
-                    "@swap" = {
+                    "swap" = {
                       mountpoint = "/.swapvol";
                       mountOptions = [
                         "nodatacow"
+                        "compress=no"
                         "noatime"
                       ];
                     };