1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
nixpkgs/nixos/modules/services
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
..
admin/salt
amqp
audio mpd service: Create playlist directory 2017-07-01 09:13:49 +02:00
backup
cluster
computing
continuous-integration
databases Merge pull request #26598 from moretea/mysql-add-bind-option 2017-06-27 19:43:41 +01:00
desktops
development
editors
games
hardware
logging heartbeat service: init 2017-07-02 10:45:59 +02:00
mail
misc
monitoring collectd service: removed insecure AmbientCapabilities 2017-06-30 11:57:46 +00:00
network-filesystems
networking network-manager: hostname option is deprecated 2017-06-28 10:56:31 +02:00
printing
scheduling
search
security
system
torrent
ttys
web-apps
web-servers lighttpd: add collectd submodule 2017-06-29 22:41:22 +00:00
x11 nixos/xserver: Allow more than one keyboard layout 2017-07-03 08:29:20 +02:00