diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-25 10:33:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 10:33:39 +0000 |
| commit | 6d9ad2710372de98a75c98ef4a35208c3db741a6 (patch) | |
| tree | 43c82da3a8eea9a18ff1ad025d37f3cfd2dadeb7 /nixos/modules/services/x11 | |
| parent | bd3e49a80ec70a9619d339a03a39ba3f580fba04 (diff) | |
| parent | c177b838dfc3bc9a7744fc8c49fc0833de6c8c40 (diff) | |
| download | nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar.gz nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar.bz2 nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar.lz nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar.xz nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.tar.zst nixlib-6d9ad2710372de98a75c98ef4a35208c3db741a6.zip | |
Merge pull request #31995 from jtojnar/xserver-libinput
Use libinput for all input devices when enabled
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/hardware/libinput.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 44555cb6e2a9..5aecdef812e6 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -198,6 +198,13 @@ in { 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.xserver.config = diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7d544e153e9a..1049f810ad2a 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -700,7 +700,6 @@ in Section "InputClass" Identifier "Keyboard catchall" MatchIsKeyboard "on" - Option "XkbRules" "base" Option "XkbModel" "${cfg.xkbModel}" Option "XkbLayout" "${cfg.layout}" Option "XkbOptions" "${cfg.xkbOptions}" |