Author: viric
Date: Mon Aug 2 19:06:42 2010
New Revision: 22904
URL: https://svn.nixos.org/websvn/nix/?rev=22904&sc=1
Log:
Making the X keyboard settings go in xorg.conf, and not in HAL anymore.
Setting to the synaptics default speeds the speeds I like. I think we were
having
defaults still from the time the values meant some different speeds.
The 'synclient' program now does not work, but the 'xinput' program
(xorg.xinput)
can modify in runtime the touchpad settings too.
Modified:
nixos/trunk/modules/services/x11/hardware/synaptics.nix
nixos/trunk/modules/services/x11/xserver.nix
Modified: nixos/trunk/modules/services/x11/hardware/synaptics.nix
==============================================================================
--- nixos/trunk/modules/services/x11/hardware/synaptics.nix Mon Aug 2
19:02:47 2010 (r22903)
+++ nixos/trunk/modules/services/x11/hardware/synaptics.nix Mon Aug 2
19:06:42 2010 (r22904)
@@ -22,12 +22,12 @@
};
minSpeed = mkOption {
- default = "0.06";
+ default = "0.6";
description = "Cursor speed factor for precision finger motion.";
};
maxSpeed = mkOption {
- default = "0.12";
+ default = "1.0";
description = "Cursor speed factor for highest-speed finger motion.";
};
@@ -36,6 +36,11 @@
description = "Whether to enable two-finger drag-scrolling.";
};
+ vertEdgeScroll = mkOption {
+ default = true;
+ description = "Whether to enable vertical edge drag-scrolling.";
+ };
+
};
};
@@ -71,6 +76,7 @@
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
'';
Modified: nixos/trunk/modules/services/x11/xserver.nix
==============================================================================
--- nixos/trunk/modules/services/x11/xserver.nix Mon Aug 2 19:02:47
2010 (r22903)
+++ nixos/trunk/modules/services/x11/xserver.nix Mon Aug 2 19:06:42
2010 (r22904)
@@ -83,31 +83,6 @@
''; # */
};
-
- halConfigFiles = singleton (pkgs.writeTextFile
- { name = "hal-policy-keymap";
- destination = "/share/hal/fdi/policy/30-keymap.fdi";
- text =
- ''
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.keymap">
- <append key="info.callouts.add"
type="strlist">hal-setup-keymap</append>
- </match>
-
- <match key="info.capabilities" contains="input.keys">
- <merge key="input.x11_options.XkbRules"
type="string">base</merge>
- <merge key="input.x11_options.XkbModel"
type="string">${cfg.xkbModel}</merge>
- <merge key="input.x11_options.XkbLayout"
type="string">${cfg.layout}</merge>
- <append key="input.x11_options.XkbOptions"
type="strlist">${cfg.xkbOptions}</append>
- </match>
- </device>
- </deviceinfo>
- '';
- });
-
-
in
{
@@ -404,8 +379,7 @@
environment.systemPackages = config.environment.x11Packages;
- services.hal.packages = halConfigFiles ++
- optional (elem "virtualbox" driverNames)
kernelPackages.virtualboxGuestAdditions;
+ services.hal.packages = optional (elem "virtualbox" driverNames)
kernelPackages.virtualboxGuestAdditions;
jobs.xserver =
{ startOn = if cfg.autorun then "filesystem and stopped udevtrigger and
started hal" else "";
@@ -483,6 +457,15 @@
${cfg.monitorSection}
EndSection
+ Section "InputClass"
+ Identifier "Keyboards catch all"
+ MatchIsKeyboard "on"
+ Option "XkbRules" "base"
+ Option "XkbModel" "${cfg.xkbModel}"
+ Option "XkbLayout" "${cfg.layout}"
+ Option "XkbOptions" "${cfg.xkbOptions}"
+ EndSection
+
Section "ServerLayout"
Identifier "Layout[all]"
${cfg.serverLayoutSection}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
