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

Add the option xkbModel in the xserver.

Browse Source 
svn path=/nixos/trunk/; revision=11041
This commit is contained in:
Nicolas Pierron 2008-03-10 17:33:13 +00:00
parent 5240c13bd2
commit 58240dc30d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/options.nix
View File

@ -1143,6 +1143,14 @@
"; ";
}; };
xkbModel = mkOption {
default = "pc104";
example = "presario";
description = "
Keyboard model.
";
};
xkbOptions = mkOption { xkbOptions = mkOption {
default = ""; default = "";
example = "grp:caps_toggle, grp_led:scroll"; example = "grp:caps_toggle, grp_led:scroll";

2
upstart-jobs/xserver.conf
View File

@ -26,7 +26,7 @@ Section "InputDevice"
Identifier "Keyboard[0]" Identifier "Keyboard[0]"
Option "Protocol" "Standard" Option "Protocol" "Standard"
Option "XkbLayout" "@layout@" Option "XkbLayout" "@layout@"
Option "XkbModel" "pc104" Option "XkbModel" "@xkbModel@"
Option "XkbRules" "xfree86" Option "XkbRules" "xfree86"
@xkbOptions@ @xkbOptions@
EndSection EndSection

1
upstart-jobs/xserver.nix
View File

@ -88,6 +88,7 @@ let
Option "XkbOptions" "${cfg.xkbOptions}" Option "XkbOptions" "${cfg.xkbOptions}"
''; '';
xkbModel = cfg.xkbModel;
layout = cfg.layout; layout = cfg.layout;
corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]"; corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]";