colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synaptics: fix to allow for more scrolling choices

Browse Source
This commit is contained in:
laMudri 2015-07-07 20:56:13 +01:00
parent 643d055058
commit 0f63a624f7
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nixos/modules/services/x11/hardware/synaptics.nix
View File

@ -63,12 +63,30 @@ in {
twoFingerScroll = mkOption { twoFingerScroll = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "Whether to enable two-finger drag-scrolling."; description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
};
horizTwoFingerScroll = mkOption {
type = types.bool;
default = cfg.twoFingerScroll;
description = "Whether to enable horizontal two-finger drag-scrolling.";
};
vertTwoFingerScroll = mkOption {
type = types.bool;
default = cfg.twoFingerScroll;
description = "Whether to enable vertical two-finger drag-scrolling.";
};
horizEdgeScroll = mkOption {
type = types.bool;
default = ! cfg.horizTwoFingerScroll;
description = "Whether to enable horizontal edge drag-scrolling.";
}; };
vertEdgeScroll = mkOption { vertEdgeScroll = mkOption {
type = types.bool; type = types.bool;
default = ! cfg.twoFingerScroll; default = ! cfg.vertTwoFingerScroll;
description = "Whether to enable vertical edge drag-scrolling."; description = "Whether to enable vertical edge drag-scrolling.";
}; };
@ -147,9 +165,10 @@ in {
Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}" Option "VertTwoFingerScroll" "${if cfg.vertTwoFingerScroll then "1" else "0"}"
Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}" Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}" Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""} ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''} ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
${cfg.additionalOptions} ${cfg.additionalOptions}