disko and bootloader changes

1 files changed, 9 insertions, 7 deletions

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index a38d74b..d58858a 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -2,17 +2,20 @@
   inputs,
   username,
   ...
-}: {
+}:
+{
   system.stateVersion = "25.05";
 
   imports = [
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480s
     inputs.disko.nixosModules.disko
     ./disko.nix
 
-    ./hardware-configuration.nix
     ../../os/default.nix
   ];
 
+  hardware.facter.reportPath = /etc/nixos/hosts/thinkpad/facter.json;
+
   os = {
     core = {
       allowUnfree.enable = true;
@@ -20,15 +23,15 @@
       audio.enable = true;
       bootloader = {
         type = "grub";
-        enableEncryption = true;
-        grubDevice = "/dev/nvme0n1";
-        luksDevice = "/dev/nvme0n1p2";
+        efi = false;
+        timeout = 0;
+        luks.enable = true;
       };
       drivers = {
         enable = true;
         cpu = "intel";
         graphics.enable = true;
-        kernel = "hardened";
+        kernel = "stable";
       };
       fonts.enable = true;
       greet.enable = true;
@@ -73,5 +76,4 @@
     };
   };
   services.thinkfan.enable = true;
-  boot.kernelModules = ["thinkpad_acpi"];
 }