Merge commit '565f837027469fc6c8f9256dea1cfad0dab4f2dc'

1 files changed, 8 insertions, 20 deletions

diff --git a/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix
index 9584bc744571..00446b8c278b 100644
--- a/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -2,31 +2,19 @@
 # standing with kernel 4.6.11 is the following wiki page:
 # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6). The
 # TrackPoint and TouchPad issues there seem to have been fixed already.
-
-{ config, pkgs, ... }:
+#
+# Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30,
+# then manually selecting Linux in the power management section.
+{ config, pkgs, lib, ... }:
 {
   imports = [
     ../.
     ../../../../common/pc/laptop/acpi_call.nix
-    ../../../../common/pc/laptop/cpu-throttling-bug.nix
   ];
 
-  # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery
-  services.tlp.extraConfig = ''
-    START_CHARGE_THRESH_BAT0=75
-    STOP_CHARGE_THRESH_BAT0=80
-    CPU_SCALING_GOVERNOR_ON_BAT=powersave
-    ENERGY_PERF_POLICY_ON_BAT=powersave
-  '';
+  # New ThinkPads have a different TrackPoint manufacturer/name.
+  # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/
+  hardware.trackpoint.device = "TPPS/2 Elan TrackPoint";
 
-  # Enable S3 suspend state: you have to manually follow the
-  # instructions shown here: https://delta-xi.net/#056 in order to
-  # produce the ACPI patched table. Put the CPIO archive in /boot and
-  # then enable the following lines
-  # boot.kernelParams = [
-  #   "mem_sleep_default=deep"
-  # ];
-  # boot.initrd.prepend = [
-  #   "${/boot/acpi_override}"
-  # ];
+  services.throttled.enable = lib.mkDefault true;
 }