diff options
| author | Domen Kožar <domen@dev.si> | 2014-03-07 13:10:31 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-03-07 13:10:31 +0100 |
| commit | 068c0aa219c2841b936e285ba211e3f2761793b6 (patch) | |
| tree | a97f33f83a4e9c8a0d7e6f12ebf72ec3f28f3602 /nixos | |
| parent | 02829889817531297e2dc82993a081b7a7152ce2 (diff) | |
| parent | 20567eba1f740350932ba5643c2613204488a396 (diff) | |
| download | nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar.gz nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar.bz2 nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar.lz nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar.xz nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.tar.zst nixlib-068c0aa219c2841b936e285ba211e3f2761793b6.zip | |
Merge pull request #1833 from coreyoconnor/fix-synaptics-config
correct tapButtons in synaptics config.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/hardware/synaptics.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 91e01f2e30b1..fe9dcd51a7a6 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -2,9 +2,23 @@ with pkgs.lib; -let cfg = config.services.xserver.synaptics; in - -{ +let cfg = config.services.xserver.synaptics; + tapConfig = if cfg.tapButtons then enabledTapConfig else disabledTapConfig; + 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}" + ''; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -106,15 +120,10 @@ let cfg = config.services.xserver.synaptics; in MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MaxTapTime" "180" - Option "MaxTapMove" "220" Option "MinSpeed" "${cfg.minSpeed}" Option "MaxSpeed" "${cfg.maxSpeed}" Option "AccelFactor" "${cfg.accelFactor}" - ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''} - Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" - Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" - Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" |