diff options
| -rw-r--r-- | sys/boot/default.nix | 24 | ||||
| -rw-r--r-- | sys/disks/default.nix | 3 | ||||
| -rw-r--r-- | sys/impermanence/default.nix | 1 |
3 files changed, 7 insertions, 21 deletions
diff --git a/sys/boot/default.nix b/sys/boot/default.nix index 1a849fbb..e5d05f31 100644 --- a/sys/boot/default.nix +++ b/sys/boot/default.nix @@ -49,23 +49,11 @@ cfg.extraEntries)} ''; in { - system.activationScripts = { - 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"]; - }; - }; + # FIXME: Reactviate this whole iso thing when a disko redeploy is done. + # (and switch to tails instead of arch)<2024-05-12> + # system.activationScripts = { + # copyExtraFilesForBoot = copyExtraFiles; + # }; boot = { initrd = { @@ -94,8 +82,6 @@ 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 a9dfd7e9..2283db96 100644 --- a/sys/disks/default.nix +++ b/sys/disks/default.nix @@ -4,6 +4,7 @@ pkgs, ... }: let + # FIXME: The iso redeploy requires a bigger efi partition <2024-05-12> cfg = config.soispha.disks; defaultMountOptions = [ "compress-force=zstd:15" # This saves disk space, at a performance cost @@ -88,7 +89,7 @@ in { content = { type = "filesystem"; format = "vfat"; - mountpoint = "/efi"; + mountpoint = "/boot"; }; }; }; diff --git a/sys/impermanence/default.nix b/sys/impermanence/default.nix index b0529bbc..d116f45f 100644 --- a/sys/impermanence/default.nix +++ b/sys/impermanence/default.nix @@ -9,7 +9,6 @@ "/etc/nixos" "/var/log" "/var/lib/systemd" - "/boot" ] ++ lib.optional config.networking.networkmanager.enable "/etc/NetworkManager" ++ lib.optional config.boot.lanzaboote.enable "/etc/secureboot" |