diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-11-30 14:10:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-11-30 14:10:34 +0100 |
| commit | 1d868aa8de4547744135ad3e67d2e38e2952c8bf (patch) | |
| tree | c8989ed18a3c1dc9654595d156bdc24fe1aea142 /nixos/modules/services/x11/xserver.nix | |
| parent | 4cbbecc85dbc5a040f2e4111093d30337718996a (diff) | |
| download | nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar.gz nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar.bz2 nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar.lz nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar.xz nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.tar.zst nixpkgs-1d868aa8de4547744135ad3e67d2e38e2952c8bf.zip | |
nixos/xserver: Move the keyboard configuration to 00-keyboard.conf
localectl looks for keyboard settings in /X11/xorg.conf.d/00-keyboard.conf Closes: #29959, #14318
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1049f810ad2..7acd621f53a 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -578,6 +578,22 @@ in target = "X11/xkb"; } ]) + # localectl looks into 00-keyboard.conf + ++ [ + { + text = '' + Section "InputClass" + Identifier "Keyboard catchall" + MatchIsKeyboard "on" + Option "XkbModel" "${cfg.xkbModel}" + Option "XkbLayout" "${cfg.layout}" + Option "XkbOptions" "${cfg.xkbOptions}" + Option "XkbVariant" "${cfg.xkbVariant}" + EndSection + ''; + target = "X11/xorg.conf.d/00-keyboard.conf"; + } + ] # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in [{ @@ -697,15 +713,6 @@ in ${cfg.monitorSection} EndSection - Section "InputClass" - Identifier "Keyboard catchall" - MatchIsKeyboard "on" - Option "XkbModel" "${cfg.xkbModel}" - Option "XkbLayout" "${cfg.layout}" - Option "XkbOptions" "${cfg.xkbOptions}" - Option "XkbVariant" "${cfg.xkbVariant}" - EndSection - # Additional "InputClass" sections ${flip concatMapStrings cfg.inputClassSections (inputClassSection: '' Section "InputClass" |