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

Merge pull request #31995 from jtojnar/xserver-libinput

Browse Source 
Use libinput for all input devices when enabled
This commit is contained in:
Orivej Desh 2017-11-25 10:33:39 +00:00 committed by GitHub
commit 6d9ad27103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/x11/hardware/libinput.nix
View File

@ -198,6 +198,13 @@ in {
environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ]; environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ];
environment.etc = [
(let cfgPath = "X11/xorg.conf.d/40-libinput.conf"; in {
source = pkgs.xorg.xf86inputlibinput.out + "/share/" + cfgPath;
target = cfgPath;
})
];
services.udev.packages = [ pkgs.libinput ]; services.udev.packages = [ pkgs.libinput ];
services.xserver.config = services.xserver.config =

1
nixos/modules/services/x11/xserver.nix
View File

@ -700,7 +700,6 @@ in
Section "InputClass" Section "InputClass"
Identifier "Keyboard catchall" Identifier "Keyboard catchall"
MatchIsKeyboard "on" MatchIsKeyboard "on"
Option "XkbRules" "base"
Option "XkbModel" "${cfg.xkbModel}" Option "XkbModel" "${cfg.xkbModel}"
Option "XkbLayout" "${cfg.layout}" Option "XkbLayout" "${cfg.layout}"
Option "XkbOptions" "${cfg.xkbOptions}" Option "XkbOptions" "${cfg.xkbOptions}"