From a6f8e4bbc0bd2e1e98590545d5fd3929d4dc55e0 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 22 Dec 2017 03:02:07 +0000
Subject: [PATCH] thinkpad: remove various assumptions

* hardware.trackpoint.emulateWheel = true; is very biased, this module
  is only for ThinkPads anyway, so default value should be used
* All options that should be overridable (e.g. services.tlp.enable)
* Hardware profile should not pull in stuff into system environment
  unless it's hardware-specific (pkgs.acpi is not)
* sound.mediaKeys clashes with DE, e.g. Xfce handling sound keys
* Drop redundant synaptics.enable = false;
---
 lenovo/thinkpad/general.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix
index 00f3c3a..cb80001 100644
--- a/lenovo/thinkpad/general.nix
+++ b/lenovo/thinkpad/general.nix
@@ -5,20 +5,7 @@ let
 in
 
 {
-  hardware.trackpoint = mkDefault {
-    enable = true;
-    emulateWheel = true;
-  };
-
-  hardware.enableRedistributableFirmware = mkDefault true;
-  services.tlp.enable = true;
-
-  services.xserver = mkDefault {
-    synaptics.enable = false;
-    libinput.enable = true;
-  };
-
-  environment.systemPackages = [ pkgs.acpi ];
-
-  sound.enableMediaKeys = mkDefault true;
+  hardware.trackpoint.enable = mkDefault true;
+  services.tlp.enable = mkDefault true;
+  services.xserver.libinput.enable = mkDefault true;
 }