BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
nixpkgs-suyu/nixos
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
..
doc/manual nixos manual: combine XML and validate separately 2017-06-29 11:25:03 -04:00
lib nixos tests: waitForWindow: output a list of windows we see prior to the final check 2017-06-20 21:16:35 -04:00
maintainers make-disk-image: change to be less VM-centric 2017-04-24 02:30:00 +00:00
modules nixos/xserver: Allow more than one keyboard layout 2017-07-03 08:29:20 +02:00
tests nixos: installer.nix test: test ZFS install use case 2017-06-28 19:45:20 -04:00
COPYING
default.nix Remove nixFallback 2017-03-06 15:54:50 +01:00
README
release-combined.nix nixos release-combined: only build zfsroot tests on x86_64-linux 2017-06-30 15:21:30 -04:00
release-small.nix nixos/release-small.nix: cleanup to use default versions 2017-01-27 15:33:54 +01:00
release.nix Merge pull request #23173 from nlewo/test/cloudinit 2017-06-05 18:34:06 -04:00

README 

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.