From 2de9b6d8556917294c2e56daae2138ebf1517767 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 23 Oct 2019 16:19:54 +0200
Subject: thinkpad: fix non-operational fan speed scaling

CPU should not reach 90C without the fans making noise, which is what
was configured.  Let the embedded controller do its job anyway, even
if it is a bit louder during low-utilisation periods.
---
 system/settings/hardware/thinkpad.nix |  4 ----
 system/settings/machines/t470s.nix    | 15 ---------------
 2 files changed, 19 deletions(-)

diff --git a/system/settings/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix
index d441fe3c..f9e5e276 100644
--- a/system/settings/hardware/thinkpad.nix
+++ b/system/settings/hardware/thinkpad.nix
@@ -11,10 +11,6 @@
     emulateWheel = true;
   };
 
-  services.thinkfan = {
-    enable = true;
-  };
-
   services.tlp = {
     enable = true;
   };
diff --git a/system/settings/machines/t470s.nix b/system/settings/machines/t470s.nix
index 7343dadb..34fdd048 100644
--- a/system/settings/machines/t470s.nix
+++ b/system/settings/machines/t470s.nix
@@ -5,21 +5,6 @@
 
   hardware.enableRedistributableFirmware = true;
 
-  services.thinkfan.sensors = ''
-    hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp3_input
-    hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp1_input
-    hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp2_input
-  '';
-  services.thinkfan.levels = ''
-    (0,     0,      48)
-    (1,     45,     52)
-    (2,     50,     57)
-    (3,     55,     63)
-    (6,     60,     65)
-    (7,     60,     85)
-    (127,   80,     32767)
-  '';
-
   boot.postBootCommands = ''
     echo bfq > /sys/block/nvme0n1/queue/scheduler
   '';
-- 
cgit 1.4.1