From 7ff60a47f014efd8dcc216d2430ece9b177e56e5 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sun, 12 May 2024 13:51:56 +0200
Subject: fix(sys/boot): Restore the bootsetup to the status quo

Having a read-only ISO (preferably tails) ready to test things is quite
cool, but actually setting this up requires an EFI partition that can
store the 1+ GB ISO. Thus, this change needs to be deferred until a disk
reinstall can be made.
---
 sys/boot/default.nix | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'sys/boot')

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
-- 
cgit 1.4.1