From 5dd535392df4ed2299ed39c4500bbd432e62cff0 Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Sun, 3 Jun 2018 01:28:40 +0200
Subject: [PATCH] Move battery settings to the configuration for all the 6th
 gen models

---
 lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 15 ---------------
 lenovo/thinkpad/x1/6th-gen/default.nix     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
index 1122d77..6b53d5e 100644
--- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
+++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
@@ -5,21 +5,6 @@
   imports = [
     ../.
   ];
-  # give tlp more control over battery
-  boot = {
-    extraModulePackages = with config.boot.kernelPackages; [
-      acpi_call
-    ];
-    kernelModules = [
-      "acpi_call"
-    ];
-  };
-
-  # see https://linrunner.de/en/tlp/docs/tlp-faq.html#battery
-  services.tlp.extraConfig = ''
-START_CHARGE_THRESH_BAT0=75
-STOP_CHARGE_THRESH_BAT0=80
-'';
   # fix font sizes in X
   services.xserver.dpi = 210;
   fonts.fontconfig.dpi = 210;
diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix
index 665d3d4..ea63de0 100644
--- a/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -2,4 +2,19 @@
   imports = [
     ../.
   ];
+  # Give TLP service more control over battery
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [
+      acpi_call
+    ];
+    kernelModules = [
+      "acpi_call"
+    ];
+  };
+
+  # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery
+  services.tlp.extraConfig = ''
+START_CHARGE_THRESH_BAT0=75
+STOP_CHARGE_THRESH_BAT0=80
+'';
 }