From 8e9175cbea86ea78fa65113529e241414b613bb3 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sun, 31 May 2026 21:40:21 +0200
Subject: 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.
---
 modules/by-name/bo/boot/module.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'modules/by-name/bo/boot')

diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 01c98d6e..f901b38d 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -35,29 +35,8 @@ in {
     # this module.
     soispha.impermanence.directories = [
       "/var/lib/sbctl"
-      "/boot"
     ];
 
-    fileSystems = {
-      # Emulate XBOOTLDR for lanzaboote (see: https://github.com/nix-community/lanzaboote/issues/173#issuecomment-1532386210)
-      "/efi/EFI/Linux" = {
-        device = "/boot/EFI/Linux";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-      "/efi/EFI/nixos" = {
-        device = "/boot/EFI/nixos";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-
-      "/efi/${tailsPrefix}" = lib.mkIf cfg.enableIsoEntry {
-        device = "/boot/${tailsPrefix}";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-    };
-
     boot = {
       initrd = {
         kernelModules = ["nvme" "btrfs"];
@@ -170,7 +149,7 @@ in {
 
         efi = {
           canTouchEfiVariables = true;
-          efiSysMountPoint = "/efi";
+          efiSysMountPoint = "/boot";
         };
       };
     };
-- 
cgit v1.3.1