alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/nixos/modules/services/x11
History
aszlig 69da1807f0
nixos/xserver: Allow more than one keyboard layout 
Regression introduced by 44c64fef16.

The services.xserver.layout option allows to specify more than one
layout separated by comma, which the commit above didn't take into
account.

This is very similar to @lheckemann's pull request (#26984) but differs
in the following ways:

  * Print out the full list available layouts (as suggested by @0xABAB
    in [1]).
  * Loop over $layout using the default IFS (and thus no need for
    escaping ${cfg.layout}), because the layouts won't contain white
    spaces.
  * Re-do the error message, which now uses multiple echos instead of a
    heredoc, so the line is wrapped according to the viewers terminal
    width.

I've tested this with several good and bad layouts and also against the
keymap NixOS VM subtests.

[1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #26961
Closes: #26984
2017-07-03 08:29:20 +02:00
..
desktop-managers lumina: 1.2.0-p1 -> 1.3.0 2017-06-29 08:13:09 -03:00
display-managers qt58: determine plugin and import paths from PATH 2017-06-18 08:44:47 -05:00
hardware treewide: use boolToString function 2017-04-11 18:18:53 +02:00
window-managers qtile: Fix using qtile together with desktop 2017-05-31 18:37:47 +03:00
colord.nix colord service: init 2016-03-11 01:58:40 +03:00
compton.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
redshift.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
terminal-server.nix nixos: update default cases from KDM/KDE4 to SDDM/KDE5 2017-02-09 21:52:00 -05:00
unclutter-xfixes.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
unclutter.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
urxvtd.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xautolock.nix services.xserver.xautolock: add module 2017-05-09 15:02:10 +02:00
xbanish.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xfs.conf Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
xfs.nix jobs -> systemd.services 2016-01-07 06:39:06 +00:00
xserver.nix nixos/xserver: Allow more than one keyboard layout 2017-07-03 08:29:20 +02:00