summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-19 22:41:39 +0000
committerGitHub <noreply@github.com>2019-11-19 22:41:39 +0000
commit687debc45b22212dd18af3d683254a08c30533d0 (patch)
tree858d9f64b2f2214dbd5f4fa16d887ca8dd44f62e
parent041d35a08afc1de270e31ae951fc5141e69cb52a (diff)
parentd6169284c46d751726a356be31ac77d52676eae2 (diff)
downloadnixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar.gz
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar.bz2
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar.lz
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar.xz
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.tar.zst
nixpkgs-687debc45b22212dd18af3d683254a08c30533d0.zip
Merge pull request #72774 from sylv-io/libinput
nixos/libinput: apply options to all device types
-rw-r--r--nixos/modules/services/x11/hardware/libinput.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 4a25232383d..71065dfc26b 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -209,12 +209,12 @@ in {
 
     services.xserver.config =
       ''
-        # Automatically enable the libinput driver for all touchpads.
+        # General libinput configuration.
+        # See CONFIGURATION DETAILS section of man:libinput(4).
         Section "InputClass"
           Identifier "libinputConfiguration"
-          MatchIsTouchpad "on"
+          MatchDriver "libinput"
           ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
-          Driver "libinput"
           Option "AccelProfile" "${cfg.accelProfile}"
           ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
           ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}