From 7422f5dae17d61c8a8e94d60723a33783160dd38 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Apr 2019 10:30:45 +0200 Subject: installer: Xfce service uses the 'service' form. * gnu/installer/services.scm (%system-services): Adjust Xfce snippet to use the 'service' form. --- gnu/installer/services.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/installer') diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 46ade0f8fa..640224688e 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -53,9 +53,7 @@ (define %system-services (snippet '(service gnome-desktop-service-type))) (desktop-environment (name "Xfce") - ;; TODO: Use 'xfce-desktop-service-type' when the 'guix' package provides - ;; it with a default value. - (snippet '(xfce-desktop-service))) + (snippet '(service xfce-desktop-service-type))) (desktop-environment (name "MATE") (snippet '(service mate-desktop-service-type))) -- cgit v1.2.3 From 469e56b4afc7a6bfdc070faf162f9fed42eca1d5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Apr 2019 10:36:37 +0200 Subject: 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. --- gnu/installer/services.scm | 11 ++++++++++- gnu/installer/steps.scm | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/installer') 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 @@ (define (system-services->configuration services) '%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 @@ (define (format-configuration steps results) '()))) steps)) (modules '((use-modules (gnu)) - (use-service-modules desktop networking ssh)))) + (use-service-modules desktop networking ssh xorg)))) `(,@modules () (operating-system ,@configuration)))) -- cgit v1.2.3 From 8d75e20e4b62470e0f0e63556794ea5a02c34359 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Apr 2019 10:42:10 +0200 Subject: installer: Use 'append' and 'list' instead of 'cons*'. * gnu/installer/services.scm (system-services->configuration): Use 'append' and 'list' instead of 'cons*'. --- gnu/installer/services.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/installer') diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 1036b21070..0e98392bfb 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -102,13 +102,13 @@ (define (system-services->configuration services) '%base-services))) (if (null? snippets) `((services ,base)) - `((services (cons* ,@snippets - - ,@(if desktop? - ;; XXX: Assume 'keyboard-layout' is in scope. - '((set-xorg-configuration - (xorg-configuration - (keyboard-layout keyboard-layout)))) - '()) + `((services (append (list ,@snippets + ,@(if desktop? + ;; XXX: Assume 'keyboard-layout' is in + ;; scope. + '((set-xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout)))) + '())) ,base)))))) -- cgit v1.2.3