mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
* Synced with trunk @ 15345
svn path=/nixos/branches/modular-nixos/; revision=15372
This commit is contained in:
parent
addf00b1cf
commit
fb1e6d5c80
@ -305,15 +305,14 @@ let
|
|||||||
videoDriver = cfg.videoDriver;
|
videoDriver = cfg.videoDriver;
|
||||||
resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
|
resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
|
||||||
|
|
||||||
videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
|
videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : `${videoDriver}'") knownVideoDrivers;
|
||||||
|
|
||||||
modules =
|
modules =
|
||||||
|
|
||||||
getAttr ["modulesFirst"] [] videoDriverModules
|
getAttr ["modulesFirst"] [] videoDriverModules
|
||||||
++ [
|
++ [
|
||||||
xorg.xorgserver
|
xorg.xorgserver
|
||||||
xorg.xf86inputkeyboard
|
xorg.xf86inputevdev
|
||||||
xorg.xf86inputmouse
|
|
||||||
]
|
]
|
||||||
++ getAttr ["modules"] [] videoDriverModules
|
++ getAttr ["modules"] [] videoDriverModules
|
||||||
++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
|
++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
|
||||||
@ -370,10 +369,10 @@ let
|
|||||||
Option "XkbOptions" "${cfg.xkbOptions}"
|
Option "XkbOptions" "${cfg.xkbOptions}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
xkbModel = cfg.xkbModel;
|
setCorePointer =
|
||||||
layout = cfg.layout;
|
if cfg.synaptics.enable then ''
|
||||||
|
InputDevice "Touchpad[0]" "CorePointer"
|
||||||
corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
|
'' else "";
|
||||||
|
|
||||||
internalAGPGART =
|
internalAGPGART =
|
||||||
if cfg.useInternalAGPGART == "yes" then
|
if cfg.useInternalAGPGART == "yes" then
|
||||||
|
@ -9,7 +9,6 @@ EndSection
|
|||||||
|
|
||||||
Section "ServerFlags"
|
Section "ServerFlags"
|
||||||
Option "AllowMouseOpenFail" "on"
|
Option "AllowMouseOpenFail" "on"
|
||||||
Option "AllowEmptyInput" "off"
|
|
||||||
EndSection
|
EndSection
|
||||||
|
|
||||||
|
|
||||||
@ -22,23 +21,6 @@ Section "Module"
|
|||||||
EndSection
|
EndSection
|
||||||
|
|
||||||
|
|
||||||
Section "InputDevice"
|
|
||||||
Driver "kbd"
|
|
||||||
Identifier "Keyboard[0]"
|
|
||||||
Option "Protocol" "Standard"
|
|
||||||
Option "XkbLayout" "@layout@"
|
|
||||||
Option "XkbModel" "@xkbModel@"
|
|
||||||
Option "XkbRules" "xfree86"
|
|
||||||
@xkbOptions@
|
|
||||||
EndSection
|
|
||||||
|
|
||||||
|
|
||||||
Section "InputDevice"
|
|
||||||
Driver "mouse"
|
|
||||||
Identifier "Mouse[0]"
|
|
||||||
Option "Device" "/dev/input/mice"
|
|
||||||
EndSection
|
|
||||||
|
|
||||||
@synapticsInputDevice@
|
@synapticsInputDevice@
|
||||||
|
|
||||||
Section "Monitor"
|
Section "Monitor"
|
||||||
@ -89,8 +71,7 @@ EndSection
|
|||||||
|
|
||||||
Section "ServerLayout"
|
Section "ServerLayout"
|
||||||
Identifier "Layout[all]"
|
Identifier "Layout[all]"
|
||||||
InputDevice "Keyboard[0]" "CoreKeyboard"
|
@setCorePointer@
|
||||||
InputDevice "@corePointer@" "CorePointer"
|
|
||||||
Screen "Screen[0]"
|
Screen "Screen[0]"
|
||||||
@serverLayoutOptions@
|
@serverLayoutOptions@
|
||||||
EndSection
|
EndSection
|
||||||
|
Loading…
Reference in New Issue
Block a user