From cbdcc55f37ad1df7503896492ff8c0a0e529d16e Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Fri, 8 Jun 2018 23:51:07 +0100
Subject: [PATCH 1/2] Add acpi_call module

---
 lenovo/thinkpad/acpi_call.nix    | 10 ++++++++++
 lenovo/thinkpad/x230/default.nix |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 lenovo/thinkpad/acpi_call.nix

diff --git a/lenovo/thinkpad/acpi_call.nix b/lenovo/thinkpad/acpi_call.nix
new file mode 100644
index 00000000000..f8c17dcc490
--- /dev/null
+++ b/lenovo/thinkpad/acpi_call.nix
@@ -0,0 +1,10 @@
+# acpi_call makes tlp work for newer thinkpads
+
+{ config, ... }:
+
+{
+  boot = {
+    kernelModules = [ "acpi_call" ];
+    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
+  };
+}
diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix
index 604df3d166d..32e5c13c7da 100644
--- a/lenovo/thinkpad/x230/default.nix
+++ b/lenovo/thinkpad/x230/default.nix
@@ -4,14 +4,11 @@
   imports = [
     ../.
     ../../../common/cpu/intel
+    ../acpi_call.nix
   ];
 
   boot = {
-    extraModulePackages = with config.boot.kernelPackages; [
-      acpi_call
-    ];
     kernelModules = [
-      "acpi_call"
       "tpm-rng"
     ];
   };

From c354d591a77b7566795f19780c7308bf34b14788 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Fri, 8 Jun 2018 23:54:34 +0100
Subject: [PATCH 2/2] Add basic t480s profile

---
 lenovo/thinkpad/t480s/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lenovo/thinkpad/t480s/default.nix

diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix
new file mode 100644
index 00000000000..026332e4e9c
--- /dev/null
+++ b/lenovo/thinkpad/t480s/default.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../acpi_call.nix
+    ../.
+  ];
+}