First attempt at a multitouch touchpad module.
Note that the Multitouch X Driver currently has no configuration beyond editing the source code, so the only option is enable or disable svn path=/nixos/trunk/; revision=28373
This commit is contained in:
parent
30861ecbc8
commit
9464c99ce2
|
@ -2,78 +2,33 @@
|
||||||
|
|
||||||
with pkgs.lib;
|
with pkgs.lib;
|
||||||
|
|
||||||
let cfg = config.services.xserver.synaptics; in
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
services.xserver.synaptics = {
|
services.xserver.multitouch = {
|
||||||
|
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
example = true;
|
example = true;
|
||||||
description = "Whether to enable touchpad support.";
|
description = "Whether to enable multitouch touchpad support.";
|
||||||
};
|
|
||||||
|
|
||||||
dev = mkOption {
|
|
||||||
default = null;
|
|
||||||
example = "/dev/input/event0";
|
|
||||||
description =
|
|
||||||
''
|
|
||||||
Path for touchpad device. Set to null to apply to any
|
|
||||||
auto-detected touchpad.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
minSpeed = mkOption {
|
|
||||||
default = "0.6";
|
|
||||||
description = "Cursor speed factor for precision finger motion.";
|
|
||||||
};
|
|
||||||
|
|
||||||
maxSpeed = mkOption {
|
|
||||||
default = "1.0";
|
|
||||||
description = "Cursor speed factor for highest-speed finger motion.";
|
|
||||||
};
|
|
||||||
|
|
||||||
twoFingerScroll = mkOption {
|
|
||||||
default = false;
|
|
||||||
description = "Whether to enable two-finger drag-scrolling.";
|
|
||||||
};
|
|
||||||
|
|
||||||
vertEdgeScroll = mkOption {
|
|
||||||
default = true;
|
|
||||||
description = "Whether to enable vertical edge drag-scrolling.";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
config = mkIf config.services.xserver.multitouch.enable {
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
services.xserver.modules = [ pkgs.xorg.xf86_input_multitouch ];
|
||||||
|
|
||||||
services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ];
|
|
||||||
|
|
||||||
services.xserver.config =
|
services.xserver.config =
|
||||||
''
|
''
|
||||||
# Automatically enable the synaptics driver for all touchpads.
|
# Automatically enable the multitouch driver
|
||||||
Section "InputClass"
|
Section "InputClass"
|
||||||
Identifier "synaptics touchpad catchall"
|
MatchIsTouchpad "true"
|
||||||
MatchIsTouchpad "on"
|
Identifier "Multitouch Touchpad"
|
||||||
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
|
Driver "multitouch"
|
||||||
Driver "synaptics"
|
|
||||||
Option "MaxTapTime" "180"
|
|
||||||
Option "MaxTapMove" "220"
|
|
||||||
Option "MinSpeed" "${cfg.minSpeed}"
|
|
||||||
Option "MaxSpeed" "${cfg.maxSpeed}"
|
|
||||||
Option "AccelFactor" "0.0010"
|
|
||||||
Option "TapButton1" "1"
|
|
||||||
Option "TapButton2" "2"
|
|
||||||
Option "TapButton3" "3"
|
|
||||||
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"}"
|
|
||||||
EndSection
|
EndSection
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue