...

2 files changed, 31 insertions, 22 deletions

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 4713892..a38d74b 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -1,5 +1,8 @@
-{ inputs, username, ... }:
 {
+  inputs,
+  username,
+  ...
+}: {
   system.stateVersion = "25.05";
 
   imports = [
@@ -15,9 +18,16 @@
       allowUnfree.enable = true;
 
       audio.enable = true;
-      bootloader = "systemd-boot";
+      bootloader = {
+        type = "grub";
+        enableEncryption = true;
+        grubDevice = "/dev/nvme0n1";
+        luksDevice = "/dev/nvme0n1p2";
+      };
       drivers = {
         enable = true;
+        cpu = "intel";
+        graphics.enable = true;
         kernel = "hardened";
       };
       fonts.enable = true;
@@ -38,7 +48,10 @@
         };
       };
       network.enable = true;
-      power.enable = true;
+      power = {
+        enable = true;
+        mode = "intel";
+      };
       security.enable = true;
       ssh.enable = true;
       storage.enable = true;
@@ -52,10 +65,13 @@
       };
       kdeconnect.enable = true;
       nix-helper.enable = true;
+      monero.enable = true;
     };
     wm = {
       enable = true;
       niri.enable = true;
     };
   };
+  services.thinkfan.enable = true;
+  boot.kernelModules = ["thinkpad_acpi"];
 }
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index f3243d8..97e5c87 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -7,67 +7,60 @@
         content = {
           type = "gpt";
           partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
+            biosboot = {
+              size = "1M";
+              type = "EF02";
             };
             luks = {
               size = "100%";
               content = {
                 type = "luks";
                 name = "crypted";
-                settings = {
-                  allowDiscards = true;
-                };
+                settings.allowDiscards = true;
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f" ];
+                  extraArgs = ["-f"];
                   subvolumes = {
-                    "@" = {
+                    "root" = {
                       mountpoint = "/";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@home" = {
+                    "home" = {
                       mountpoint = "/home";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@nix" = {
+                    "nix" = {
                       mountpoint = "/nix";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@log" = {
+                    "log" = {
                       mountpoint = "/var/log";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@vms" = {
+                    "vms" = {
                       mountpoint = "/vms";
                       mountOptions = [
                         "nodatacow"
                         "noatime"
                       ];
                     };
-                    "@swap" = {
+                    "swap" = {
                       mountpoint = "/.swapvol";
                       mountOptions = [
                         "nodatacow"
+                        "compress=no"
                         "noatime"
                       ];
                     };