I am NOT! A MORON!

YES YOU ARE! YOU ARE A MORON THEY BUILT TO MAKE ME AN IDIOT!
oomfiee · Nov 12, 2024 · 4723b80 · 4723b80
1 parent f403304
commit 4723b80
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 77 deletions.
diff --git a/Modules/Home/Users/oomfie/users.nix b/Modules/Home/Users/oomfie/users.nix
@@ -4,7 +4,7 @@
     isNormalUser = true;
     initialPassword = "nixos";
     description = userSettings.username;
-    extraGroups = [ "networkmanager" "wheel" "tss" "scanner" "lp" "audio" "docker" ];
+    extraGroups = [ "networkmanager" "wheel" "scanner" "lp" "audio" "docker" ];
     shell = pkgs.${userSettings.sh};
    };
 }
diff --git a/Modules/NixOS/Core/Bootloader/default.nix b/Modules/NixOS/Core/Bootloader/default.nix
@@ -2,6 +2,6 @@
 {
 
 imports = [
- #( ./. +("/"+bootloader)+".nix")
+ ( ./. +("/"+bootloader)+".nix")
 ];
 }
diff --git a/Modules/NixOS/Core/Bootloader/systemd-boot.nix b/Modules/NixOS/Core/Bootloader/systemd-boot.nix
@@ -3,18 +3,18 @@
 
 boot = {
   loader = {
-    systemd-boot.enable = true;
+    systemd-boot.enable = lib.mkForce false;
     efi.canTouchEfiVariables = true;
     systemd-boot.configurationLimit = 10;
   };
-# lanzaboote = {
-#   enable = true;
-#   pkiBundle = "/etc/secureboot";
-# };
-#   bootspec.enable = true;
-#   initrd.systemd = {
-#   enable = true;
-#   enableTpm2 = true;
-#   };
+lanzaboote = {
+  enable = true;
+  pkiBundle = "/etc/secureboot";
+};
+  bootspec.enable = true;
+  initrd.systemd = {
+  enable = true;
+  tpm2.enable = true;
+  };
   };
 }
diff --git a/Modules/NixOS/Hardware/default.nix b/Modules/NixOS/Hardware/default.nix
@@ -3,9 +3,9 @@
     imports = [
         ./keyboard.nix                                           # Keyboard layouts
         ./printing.nix                                           # Print drivers
-        #./drive.nix                                             # HDD & SDD drives 
         ./firmware.nix                                           # Firmware support
         #./rtw-drivers.nix
+        ./tpm.nix
         ( ./. +("/"+systemSettings.swap)+".nix")
     ];
 }
diff --git a/Modules/NixOS/Hardware/drive.nix b/Modules/NixOS/Hardware/drive.nix
diff --git a/Modules/NixOS/Hardware/tpm.nix b/Modules/NixOS/Hardware/tpm.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, userSettings,... }:
+{
+
+# enable TPM
+    security.tpm2.enable = true;
+    security.tpm2.pkcs11.enable = true;  # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
+    security.tpm2.tctiEnvironment.enable = true;  # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
+    users.users.${userSettings.username}.extraGroups = [ "tss" ];  # tss group has access to TPM devices
+}