diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2018-12-05 14:36:22 +0900 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-17 14:04:23 +0100 |
| commit | c088b2e47f6675199f1ef545df7d04d4532e64e3 (patch) | |
| tree | 335f80e187ea1da73fbb39a1ca296166e714db90 /gnu/installer/keymap.scm | |
| parent | dc5f3275ecbddc804875899e9e457299a835d7ab (diff) | |
| download | guix-patches-c088b2e47f6675199f1ef545df7d04d4532e64e3.tar guix-patches-c088b2e47f6675199f1ef545df7d04d4532e64e3.tar.gz | |
installer: Do not ask for keyboard model.
Suppose that the keyboard model is "pc105".
* gnu/installer.scm (apply-keymap): Remove model ...
* gnu/installer/newt/keymap.scm (run-keymap-page): passed here.
(run-model-page): remove procedure
* gnu/installer/record.scm (installer): Edit keymap-page prototype in comment.
* gnu/installer/keymap.scm (default-keyboard-model): New exported parameter.
Diffstat (limited to 'gnu/installer/keymap.scm')
| -rw-r--r-- | gnu/installer/keymap.scm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm index 78065aa6c6..d9f8656855 100644 --- a/gnu/installer/keymap.scm +++ b/gnu/installer/keymap.scm @@ -46,6 +46,7 @@ x11-keymap-variant-name x11-keymap-variant-description + default-keyboard-model xkb-rules->models+layouts kmscon-update-keymap)) @@ -68,6 +69,9 @@ (name x11-keymap-variant-name) ;string (description x11-keymap-variant-description)) ;string +;; Assume all modern keyboards have this model. +(define default-keyboard-model (make-parameter "pc105")) + (define (xkb-rules->models+layouts file) "Parse FILE and return two values, the list of supported X11-KEYMAP-MODEL and X11-KEYMAP-LAYOUT records. FILE is an XML file from the X Keyboard |