diff --git a/modules/nixos/config/boot/default.nix b/modules/nixos/config/boot/default.nix
index 89c9042..010eb4e 100644
--- a/modules/nixos/config/boot/default.nix
+++ b/modules/nixos/config/boot/default.nix
@@ -14,7 +14,6 @@
     kernelPackages = pkgs.linuxPackages_cachyos;
     initrd = {
       systemd.enable = true;
-      systemd.tpm2.enable = false;
     };
   };
 }
diff --git a/modules/nixos/config/default.nix b/modules/nixos/config/default.nix
index 2a21626..deda6c0 100644
--- a/modules/nixos/config/default.nix
+++ b/modules/nixos/config/default.nix
@@ -1,6 +1,6 @@
 {
   config,
-  inputs,
+  # inputs,
   lib,
   pkgs,
   ...
@@ -31,9 +31,10 @@ in {
     };
   };
   config = lib.mkMerge [
-    (mkIf cfg.tpmDiskUnlock {
-      boot.initrd.systemd.tpm2.enable = mkDefault true;
-    })
+    {
+      boot.initrd.systemd.tpm2.enable = mkDefault cfg.tpmDiskUnlock;
+      boot.loader.systemd-boot.enable = mkDefault (!cfg.secureBoot);
+    }
     (mkIf cfg.useIwd {
       networking = {
         networkmanager.wifi.backend = "iwd";