Add the option xkbModel in the xserver.

svn path=/nixos/trunk/; revision=11041

system/options.nix

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

upstart-jobs/xserver.conf

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

upstart-jobs/xserver.nix

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