diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-08 10:36:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-08 10:42:51 +0200 |
| commit | 469e56b4afc7a6bfdc070faf162f9fed42eca1d5 (patch) | |
| tree | c96d6820482b35068f3028338296359fad63f173 | |
| parent | 7422f5dae17d61c8a8e94d60723a33783160dd38 (diff) | |
| download | guix-469e56b4afc7a6bfdc070faf162f9fed42eca1d5.tar.gz | |
installer: Generate 'set-xorg-configuration' snippet.
* gnu/installer/services.scm (system-services->configuration): Add 'set-xorg-configuration' service. * gnu/installer/steps.scm (format-configuration): Add 'xorg' service module.
| -rw-r--r-- | gnu/installer/services.scm | 11 | ||||
| -rw-r--r-- | gnu/installer/steps.scm | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 640224688e..1036b21070 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -102,4 +102,13 @@ '%base-services))) (if (null? snippets) `((services ,base)) - `((services (cons* ,@snippets ,base)))))) + `((services (cons* ,@snippets + + ,@(if desktop? + ;; XXX: Assume 'keyboard-layout' is in scope. + '((set-xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout)))) + '()) + + ,base)))))) diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 96cfdd03d1..1483cdc3db 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -215,7 +215,7 @@ found in RESULTS." '()))) steps)) (modules '((use-modules (gnu)) - (use-service-modules desktop networking ssh)))) + (use-service-modules desktop networking ssh xorg)))) `(,@modules () (operating-system ,@configuration)))) |