summaryrefslogtreecommitdiffstats
path: root/lenovo
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2017-09-03 23:31:08 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2017-09-03 23:31:08 +0200
commited46b99315a10254dfa4753423b45c1782465647 (patch)
tree6af0d94cd71767482f33f5844f4385146f0baea5 /lenovo
parenta2e55b93adf6d19d6d7f6cc831224997de84d7dc (diff)
Use `libinput` as touchpad driver
The recommended driver is libinput, furthermore the packaging of synaptics is officially deprecated in NixOS: https://github.com/NixOS/nixpkgs/commit/9d2777a5a5f861a727d09c3ecdeffd8c72c143b7
Diffstat (limited to 'lenovo')
-rw-r--r--lenovo/general.nix5
-rw-r--r--lenovo/t460s.nix7
-rw-r--r--lenovo/x220i-tablet.nix3
-rw-r--r--lenovo/x250.nix2
4 files changed, 5 insertions, 12 deletions
diff --git a/lenovo/general.nix b/lenovo/general.nix
index 0afdaaf..f539cc2 100644
--- a/lenovo/general.nix
+++ b/lenovo/general.nix
@@ -10,4 +10,9 @@ with lib;
hardware.enableAllFirmware = true;
services.tlp.enable = true;
+
+ services.xserver = {
+ synaptics.enable = false;
+ libinput.enable = true;
+ };
}
diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix
index 9d68cfd..a274b37 100644
--- a/lenovo/t460s.nix
+++ b/lenovo/t460s.nix
@@ -37,11 +37,4 @@
# Aspect Ratio: 16 × 9 (1.78:1)
# Pixel Count: 3,686,400
# Megapixels: 3.69MP
-
- # Use libinput to let the physical middle button be used to scroll
- # with the trackpoint
- services.xserver = {
- libinput.enable = true;
- synaptics.enable = false;
- };
}
diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix
index 068baa8..3c729ba 100644
--- a/lenovo/x220i-tablet.nix
+++ b/lenovo/x220i-tablet.nix
@@ -14,9 +14,6 @@
# hard disk protection if the laptop falls
services.hdapsd.enable = true;
- # alternatively, touchpad with two-finger scrolling
- #services.xserver.libinput.enable = true;
-
# enable volume control buttons
sound.enableMediaKeys = true;
diff --git a/lenovo/x250.nix b/lenovo/x250.nix
index 52a4426..8ab1aa5 100644
--- a/lenovo/x250.nix
+++ b/lenovo/x250.nix
@@ -5,6 +5,4 @@
# modesetting driver leads to freezes with newer kernel at the moment (> 4.4)
services.xserver.videoDrivers = [ "intel" ];
-
- services.xserver.libinput.enable = true;
}