diff options
| -rw-r--r-- | modules/by-name/bo/boot/module.nix | 23 | ||||
| -rw-r--r-- | modules/by-name/di/disks/module.nix | 13 |
2 files changed, 5 insertions, 31 deletions
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"; }; }; }; 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 = [ |