nixpkgs/nixos/modules
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
..
config nsswitch: only add modules to nsswitch.conf if they can be loaded 2017-06-30 02:44:23 +02:00
hardware nvidia module: link proper output as OpenGL drivers 2017-05-31 16:30:21 +03:00
i18n/input-method Remove top-level kde5 attribute 2017-02-27 11:49:10 -06:00
installer nix: 1.11.10 -> 1.11.11 2017-06-19 19:03:39 +02:00
misc collectd service: minor refactoring 2017-06-30 00:52:22 +00:00
profiles nixos: replaced "userns" with "user namespaces" for clarity 2017-06-22 22:04:34 +02:00
programs browserpass: 2017-04-11 -> 1.0.5 2017-06-30 13:32:45 +02:00
security security-wrapper: run activation script after specialfs 2017-06-26 09:26:16 +02:00
service-managers Simple proof of concept for how to do other types of services 2017-05-26 18:14:31 -04:00
services nixos/xserver: Allow more than one keyboard layout 2017-07-03 08:29:20 +02:00
system luksroot: fix typo 2017-07-02 04:37:51 +02:00
tasks Merge pull request #26170 from kirelagin/wlan-fix 2017-06-17 15:31:22 +01:00
testing kdm: drop service 2017-02-11 13:55:09 -05:00
virtualisation xen_4_8: init at 4.8.1 2017-06-27 12:01:53 +00:00
module-list.nix Merge pull request #26978 from volth/lighttpd-collectd-submodule 2017-07-02 11:49:06 +01:00
rename.nix programs.zsh: rename oh-my-zsh to ohMyZsh 2017-05-25 10:51:26 +02:00