From 3bfbd935fcd3ccf3dc30b0cd0b0b37e8011e0fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Tue, 11 Aug 2026 10:20:56 +0200
Subject: [PATCH] Thinkfan improvements

---
 hosts/Aloria/default.nix                | 15 +++++++++++++--
 hosts/Aloria/hardware-configuration.nix |  3 ---
 hosts/Common/desktop.nix                |  6 +-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index 829b6c7..9fd2e2a 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -24,7 +24,17 @@ in {
   services.logind.settings.Login = {
     HandlePowerKey = "suspend";
   };
-  services.throttled.enable = true;
+  # 'throttled' raises PL1/PL2 to 44W, but this machine is a Core Ultra 7 155U
+  # with a 15W spec sustained power. Holding it at 44W drives the chassis sensor
+  # (acpitz) past its 109C critical trip, which makes the kernel do a hardware
+  # protection shutdown. Leave the firmware's own power limits alone.
+  services.throttled.enable = false;
+
+  # thermald refuses to run on ThinkPads exposing thinkpad_acpi/dytc_lapmode,
+  # because the platform's DPTF firmware owns thermal management there. It exits
+  # immediately at boot, so enabling it only produces noise in the journal.
+  services.thermald.enable = lib.mkForce false;
+
   services.thinkfan.enable = true;
   services.thinkfan.settings = {
     sensors = [
@@ -60,7 +70,8 @@ in {
       [2 50 60]
       [3 56 68]
       [5 64 78]
-      [7 76 95]
+      [7 76 90]
+      ["level disengaged" 85 32767]
     ];
   };
 
diff --git a/hosts/Aloria/hardware-configuration.nix b/hosts/Aloria/hardware-configuration.nix
index f49cb0d..7fda0b1 100644
--- a/hosts/Aloria/hardware-configuration.nix
+++ b/hosts/Aloria/hardware-configuration.nix
@@ -53,9 +53,6 @@
   hardware.trackpoint.enable = lib.mkDefault true;
   hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable;
   hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
-  nixpkgs.config.packageOverrides = pkgs: {
-    zfs = pkgs.zfs_unstable;
-  };
   boot.kernelPackages = pkgs.linuxPackages;
   boot.zfs.forceImportRoot = false;
   hardware.firmware = with pkgs; [
diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix
index ba7ab5d..9c2e69e 100644
--- a/hosts/Common/desktop.nix
+++ b/hosts/Common/desktop.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   services.udev.packages = [pkgs.yubikey-personalization];
   programs.appimage.enable = true;
   programs.appimage.binfmt = true;