summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-05 23:37:33 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-06 00:14:13 +0200
commit2729cb406d9f3e9eb22cc660f887138134edb3a8 (patch)
treedacd0b6cd5cb8c4d0eaaa34300fb5a696b8ddf7f /doc
parentf4783d77ed8a24633611693b091102b226004971 (diff)
downloadguix-2729cb406d9f3e9eb22cc660f887138134edb3a8.tar.gz
system: Allow for comma-separated keyboard layouts.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.

* gnu/bootloader/grub.scm (keyboard-layout-file): Replace commas with
hyphens in the first argument to 'computed-file'.
* gnu/system/keyboard.scm (keyboard-layout->console-keymap): Likewise.
* doc/guix.texi (Keyboard Layout): Add example.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index bc5602474e..67cedaec1b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11916,6 +11916,9 @@ about.  Here are a few example:
 ;; The Catalan layout.
 (keyboard-layout "es" "cat")
 
+;; Arabic layout with "Alt-Shift" to switch to US layout.
+(keyboard-layout "ar,us" #:options '("grp:alt_shift_toggle"))
+
 ;; The Latin American Spanish layout.  In addition, the
 ;; "Caps Lock" key is used as an additional "Ctrl" key,
 ;; and the "Menu" key is used as a "Compose" key to enter