tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-26 02:51:49 +02:00
Code Activity

installer: Set the system's 'keyboard-layout' field.

Browse Source 
* gnu/installer/newt/keymap.scm (keyboard-layout->configuration): New
procedure.
* gnu/installer.scm (compute-keymap-step): Return RESULT.
(installer-steps) <'keymap>: Add 'configuration-formatter' field.
(installer-program): Use (gnu installer newt keymap).
* gnu/installer/parted.scm (bootloader-configuration): Set
'keyboard-layout'.
This commit is contained in:
Ludovic Courtès
2019-03-25 23:21:08 +01:00
parent cde08a5120
commit 3191b5f6ba
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/installer.scm
+7 -2
View File
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -156,7 +157,8 @@ selected keymap."
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts)))))
(#$apply-keymap result))))
(#$apply-keymap result)
result)))
(define (installer-steps)
(let ((locale-step (compute-locale-step
@@ -208,7 +210,8 @@ selected keymap."
(id 'keymap)
(description (G_ "Keyboard mapping selection"))
(compute (lambda _
(#$keymap-step current-installer))))
(#$keymap-step current-installer)))
(configuration-formatter keyboard-layout->configuration))
;; Run a partitioning tool allowing the user to modify
;; partition tables, partitions and their mount points.
@@ -313,6 +316,8 @@ selected keymap."
(gnu installer timezone)
(gnu installer user)
(gnu installer newt)
((gnu installer newt keymap)
#:select (keyboard-layout->configuration))
(guix i18n)
(guix build utils)
(ice-9 match))