summary refs log tree commit diff
diff options
context:
space:
mode:
authorAristid Breitkreuz <aristidb@gmail.com>2014-11-08 19:38:06 +0100
committerAristid Breitkreuz <aristidb@gmail.com>2014-11-08 19:38:06 +0100
commit8b949e5ff5292445dea17a70ab9722b66083c273 (patch)
tree7892a26d1cdc19016a80cd9084da6194e9923ce1
parent8b50383c451556e1eb16543021bc2f2bb94b6425 (diff)
parent5f84c785ff959b8eceaba0a5218d969fe9501218 (diff)
downloadnixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar.gz
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar.bz2
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar.lz
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar.xz
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.tar.zst
nixlib-8b949e5ff5292445dea17a70ab9722b66083c273.zip
Merge pull request #4823 from abbradar/synaptics-fix
synaptics: fix tapButtons setting
-rw-r--r--nixos/modules/services/x11/hardware/synaptics.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index d9e4bd817a51..9e44ce811c3e 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -7,9 +7,9 @@ let cfg = config.services.xserver.synaptics;
     enabledTapConfig = ''
       Option "MaxTapTime" "180"
       Option "MaxTapMove" "220"
-      Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}"
-      Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}"
-      Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}"
+      Option "TapButton1" "${builtins.elemAt cfg.fingersMap 0}"
+      Option "TapButton2" "${builtins.elemAt cfg.fingersMap 1}"
+      Option "TapButton3" "${builtins.elemAt cfg.fingersMap 2}"
     '';
     disabledTapConfig = ''
       Option "MaxTapTime" "0"
@@ -147,9 +147,6 @@ in {
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
           Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
-          Option "TapButton1" "${builtins.elemAt cfg.fingersMap 0}"
-          Option "TapButton2" "${builtins.elemAt cfg.fingersMap 1}"
-          Option "TapButton3" "${builtins.elemAt cfg.fingersMap 2}"
           Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"