1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 02:24:27 +00: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 salt-minion: link to configuration documentation 2017-05-11 07:12:04 +01:00
amqp
audio mpd service: Create playlist directory 2017-07-01 09:13:49 +02:00
backup znapzend service: options for logging/nodestroy/restart on failure 2017-05-22 21:47:51 +01:00
cluster Kubernetes ABAC policy file fix (#26499) 2017-06-13 21:54:36 +02:00
computing nixos/treewide: remove boolean examples for options 2017-03-17 23:36:19 +01:00
continuous-integration hydra: restart daemons on config change 2017-06-27 17:09:13 +02:00
databases Merge pull request #26598 from moretea/mysql-add-bind-option 2017-06-27 19:43:41 +01:00
desktops gnome-disks: add D-Bus service 2017-05-06 19:40:37 +02:00
development
editors Merge pull request #22508 from matthewbauer/remove-emacs24macport 2017-03-18 22:19:20 +01:00
games
hardware Merge pull request #21227 from lheckemann/vgaswitcheroo 2017-04-28 12:47:00 +01:00
logging heartbeat service: init 2017-07-02 10:45:59 +02:00
mail mailhog: init at 1.0.0 (#26821) 2017-06-24 17:05:34 +01:00
misc plex: fix preStart permissions 2017-06-24 18:48:47 +02:00
monitoring collectd service: removed insecure AmbientCapabilities 2017-06-30 11:57:46 +00:00
network-filesystems Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors 2017-06-01 22:06:21 +02:00
networking network-manager: hostname option is deprecated 2017-06-28 10:56:31 +02:00
printing cups: split the $lib output 2017-03-12 18:36:30 +01:00
scheduling fcron: install systab 2017-04-23 11:44:04 +02:00
search ELK: update kibana and the elastic beats to 5.4 (#26252) 2017-06-13 22:36:08 +02:00
security Simple proof of concept for how to do other types of services 2017-05-26 18:14:31 -04:00
system Merge pull request #23024 from phile314/cloud-init-update 2017-05-22 16:33:31 +02:00
torrent treewide: use boolToString function 2017-04-11 18:18:53 +02:00
ttys kmscon service: disable systemd-vconsole-setup 2017-03-01 13:47:34 +03:00
web-apps piwik & piwik service: init at 3.0.4 2017-06-19 16:00:17 +02:00
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