Merge branch 'master' into staging

2 files changed, 12 insertions, 5 deletions

diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index 46ade0f8fa..0e98392bfb 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -53,9 +53,7 @@
       (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)))
@@ -104,4 +102,13 @@
                        '%base-services)))
     (if (null? snippets)
         `((services ,base))
-        `((services (cons* ,@snippets ,base))))))
+        `((services (append (list ,@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))))