diff --git a/template/disk-configs/luks-btrfs.nix b/template/disk-configs/luks-btrfs.nix index 487aeed..61a1dd5 100644 --- a/template/disk-configs/luks-btrfs.nix +++ b/template/disk-configs/luks-btrfs.nix @@ -16,6 +16,12 @@ content = { type = "gpt"; partitions = { + # This partition is required for BIOS/GPT compatibility. + BOOT = { + name = "boot"; + size = "1M"; + type = "EF02"; + }; ESP = { label = "EFI"; name = "ESP"; @@ -25,9 +31,6 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; }; }; LUKS = { diff --git a/template/flake.nix b/template/flake.nix index 9e57b26..5dd3718 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -37,6 +37,7 @@ # Memory in bytes required to unlock the LUKS partition while booting. # The default value is 1 GB (1000000). # Set this as high as possible, but leave some buffer (e.g. 500 MB). + # As of 2024-02 the possible maximum is 4194304 # Example: If you have 4 GB memory, set this to 3500000. pbkdf-memory = 4000000; }) @@ -59,8 +60,16 @@ # efiInstallAsRemovable = true; #}; - # Alternative to grub. - # This worked with yodaHP host. + # Bootloader: BIOS (old systems) + #boot.loader.grub = { + # # No need to set devices, disko will add all devices that have a EF02 partition to the list. + # # devices = []; + # efiSupport = true; + # efiInstallAsRemovable = true; + #}; + + # Bootloader: EFI (newer systems) + # boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true;