fix secureboot again

diff --git a/config/nix.org b/config/nix.org
index c256b8e59be0a4e32a68a00efda474469a80b162..a2145164937ddb0cf544ecead96e139e8a003303 100644 (file)
--- a/config/nix.org
+++ b/config/nix.org
@@ -1378,7 +1378,7 @@ because they enhance security.
       };
 
       loader = {
       };
 
       loader = {

-         systemd-boot.enable = lib.mkForce (! config.monorepo.profiles.grub.enable);
+         systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) || (! config.monorepo.profiles.secureBoot.enable));

          efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
       };
 
          efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
       };
 

diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix
index bf7311778f5fb4b6cdb20d3f0a955a6003b7fcfc..9ecf29191d5b25b3020c292077afa9021bfb74fb 100644 (file)
--- a/nix/modules/configuration.nix
+++ b/nix/modules/configuration.nix
@@ -87,7 +87,7 @@
     };
 
     loader = {
     };
 
     loader = {

-         systemd-boot.enable = lib.mkForce (! config.monorepo.profiles.grub.enable);
+         systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) || (! config.monorepo.profiles.secureBoot.enable));

          efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
     };
 
          efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
     };