modules/{disks,boot}: Give up on hacky XBOOTLDR support

We would effectively need a separate partition without LUKS for that to
work. And because we are not working around Windows EFI, it's easier to
just make the real EFI partition bigger.

1 files changed, 4 insertions, 9 deletions

diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix
index 15549453..ed5c939a 100644
--- a/modules/by-name/di/disks/module.nix
+++ b/modules/by-name/di/disks/module.nix
@@ -50,7 +50,7 @@ in {
 
     services.btrfs.autoScrub = {
       enable = true;
-      fileSystems = ["/srv" "/nix" "/boot"];
+      fileSystems = ["/srv" "/nix"];
       interval = "monthly";
     };
 
@@ -62,15 +62,14 @@ in {
             type = "gpt";
             partitions = {
               ESP = {
-                # This can be relatively small, as we store all the big stuff in the
-                # XBOOTLDR directory.
-                size = "256M";
+                # 2GiB plus 512MiB for tails ISO and normal boot stuff
+                size = "2600M";
 
                 type = "EF00";
                 content = {
                   type = "filesystem";
                   format = "vfat";
-                  mountpoint = "/efi";
+                  mountpoint = "/boot";
                   mountOptions = ["umask=0077"];
                 };
               };
@@ -108,10 +107,6 @@ in {
                         mountpoint = "/srv/.snapshots";
                         mountOptions = defaultMountOptions;
                       };
-                      "boot" = {
-                        mountpoint = "/boot";
-                        mountOptions = defaultMountOptions;
-                      };
                       "swap" = {
                         mountpoint = "/swap";
                         mountOptions = [