05/07: services: slim: Add xterm to the system profile.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit e9b8212414ce9eb113ab36c2353d0bfa1a1acab4
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 2 22:04:17 2015 +0100

    services: slim: Add xterm to the system profile.
    
    * gnu/services/xorg.scm (slim-service-type): Extend
      PROFILE-SERVICE-TYPE.
    * gnu/system/examples/desktop.tmpl (packages): Remove XTERM.
---
 gnu/services/xorg.scm            |    7 ++++++-
 gnu/system/examples/desktop.tmpl |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 639a541..f4bc824 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -309,7 +309,12 @@ reboot_cmd " dmd "/sbin/reboot\n"
                  (list (service-extension dmd-root-service-type
                                           slim-dmd-service)
                        (service-extension pam-root-service-type
-                                          slim-pam-service)))))
+                                          slim-pam-service)
+
+                       ;; Unconditionally add xterm to the system profile, to
+                       ;; avoid bad surprises.
+                       (service-extension profile-service-type
+                                          (const (list xterm)))))))
 
 (define* (slim-service #:key (slim slim)
                        (allow-empty-passwords? #t) auto-login?
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 0e26a7e..ff2a1b7 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -3,7 +3,7 @@
 
 (use-modules (gnu) (gnu system nss))
 (use-service-modules desktop)
-(use-package-modules xfce ratpoison avahi xorg certs)
+(use-package-modules xfce ratpoison avahi certs)
 
 (operating-system
   (host-name "antelope")
@@ -40,7 +40,7 @@
   ;; Add Xfce and Ratpoison; that allows us to choose
   ;; sessions using either of these at the log-in screen.
   (packages (cons* xfce ratpoison    ;desktop environments
-                   xterm avahi       ;useful tools
+                   avahi             ;useful tools
                    nss-certs         ;for HTTPS access
                    %base-packages))