more work on hosts/ and modules/config

Signed-off-by: unexplrd <unexplrd@linerds.us>

modules/nixos/config/boot/default.nix

@@ -29,8 +29,8 @@
       # "module.sig_enforce=1"
     ];
     initrd = {
-      systemd.enable = true; # needed for auto-unlocking with TPM
-      systemd.tpm2.enable = config.module.config.tpmDiskUnlock;
+      systemd.enable = true;
+      systemd.tpm2.enable = false;
     };
   };
 }

modules/nixos/config/boot/lanzaboote.nix

@@ -1,7 +1,6 @@
 {
   config,
   inputs,
-  lib,
   ...
 }: {
   imports = with inputs; [
@@ -12,6 +11,5 @@
       enable = config.module.config.secureBoot;
       pkiBundle = "/var/lib/sbctl";
     };
-    loader.systemd-boot.enable = lib.mkDefault (!config.boot.lanzaboote.enable);
   };
 }

modules/nixos/config/boot/loader.nix

@@ -7,7 +7,6 @@
     timeout = 3;
     efi.canTouchEfiVariables = true;
     systemd-boot = {
-      enable = true;
       consoleMode = "auto";
       configurationLimit = lib.mkOverride 1337 10;
     };