diff options
| -rw-r--r-- | sys/boot/default.nix | 24 | ||||
| -rw-r--r-- | sys/disks/default.nix | 2 | ||||
| -rw-r--r-- | sys/impermanence/default.nix | 4 |
3 files changed, 23 insertions, 7 deletions
diff --git a/sys/boot/default.nix b/sys/boot/default.nix index 0a45fd08..d8f67fa3 100644 --- a/sys/boot/default.nix +++ b/sys/boot/default.nix @@ -17,10 +17,10 @@ nixosDir = "/EFI/nixos"; copyExtraFiles = '' - echo "[Systemd-boot] copying files to ${bootMountPoint}" - empty_file=$(mktemp) + echo "[systemd-boot] copying files to ${bootMountPoint}" + empty_file=$(mktemp) - ${lib.concatStrings (lib.mapAttrsToList (n: v: + ${lib.concatStrings (lib.mapAttrsToList (n: v: /* bash */ @@ -32,7 +32,7 @@ '') cfg.extraFiles)} - ${lib.concatStrings (lib.mapAttrsToList (n: v: + ${lib.concatStrings (lib.mapAttrsToList (n: v: /* bash */ @@ -49,6 +49,20 @@ in { copyExtraFilesForBoot = copyExtraFiles; }; + # Help lanzaboote with the filesystems + # source: https://github.com/nix-community/lanzaboote/issues/173#issuecomment-1532386210 + # TODO: Remove this workaround <2024-05-11> + fileSystems = { + "/efi/EFI/Linux" = { + device = "/boot/EFI/Linux"; + options = ["bind"]; + }; + "/efi/EFI/nixos" = { + device = "/boot/EFI/nixos"; + options = ["bind"]; + }; + }; + boot = { initrd = { #compressor = "lz4"; @@ -76,6 +90,8 @@ in { # for now. enable = false; + xbootldrMountPoint = "/boot"; + extraEntries = { "live.conf" = '' title Archlinux Live ISO diff --git a/sys/disks/default.nix b/sys/disks/default.nix index 2d88f57e..97c1fc4f 100644 --- a/sys/disks/default.nix +++ b/sys/disks/default.nix @@ -86,7 +86,7 @@ in { content = { type = "filesystem"; format = "vfat"; - mountpoint = "/boot"; + mountpoint = "/efi"; }; }; }; diff --git a/sys/impermanence/default.nix b/sys/impermanence/default.nix index 1ae35761..b0529bbc 100644 --- a/sys/impermanence/default.nix +++ b/sys/impermanence/default.nix @@ -9,8 +9,7 @@ "/etc/nixos" "/var/log" "/var/lib/systemd" - # TODO: the following entries need to be checked - #"/var/lib/nixos" + "/boot" ] ++ lib.optional config.networking.networkmanager.enable "/etc/NetworkManager" ++ lib.optional config.boot.lanzaboote.enable "/etc/secureboot" @@ -25,6 +24,7 @@ in { description = lib.mdDoc "Disk setup with disko"; }; }; + config = lib.mkIf cfg.enable { # needed for the hm impermanence config programs.fuse.userAllowOther = true; |