summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-28 23:03:11 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-28 23:06:59 +0100
commit357b287b8f083e8b078da4a3246e0bad4ef199ac (patch)
tree12b51ad1779b8f938ee9f1922a6e51d2cb20028f /doc
parent971e6560eb7b852ccc30d0891c2b7d26e5d0971a (diff)
services: desktop: Switch to GDM.
* gnu/services/desktop.scm (%desktop-services): Replace SLIM-SERVICE-TYPE instance with an instance of GDM-SERVICE-TYPE. * doc/guix.texi (Keyboard Layout): Change example to mention GDM-SERVICE-TYPE. (X Window): Mention GDM. (Desktop Services): Adjust references to SLiM.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi18
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 1bbed7a72d7..525b8f424f0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11090,8 +11090,8 @@ configuration would look like:
11090 (target "/boot/efi") 11090 (target "/boot/efi")
11091 (keyboard-layout keyboard-layout))) ;for GRUB 11091 (keyboard-layout keyboard-layout))) ;for GRUB
11092 (services (modify-services %desktop-services 11092 (services (modify-services %desktop-services
11093 (slim-service-type config => 11093 (gdm-service-type config =>
11094 (slim-configuration 11094 (gdm-configuration
11095 (inherit config) 11095 (inherit config)
11096 (xorg-configuration 11096 (xorg-configuration
11097 (xorg-configuration ;for Xorg 11097 (xorg-configuration ;for Xorg
@@ -13294,7 +13294,13 @@ Package object of the Open vSwitch.
13294Support for the X Window graphical display system---specifically 13294Support for the X Window graphical display system---specifically
13295Xorg---is provided by the @code{(gnu services xorg)} module. Note that 13295Xorg---is provided by the @code{(gnu services xorg)} module. Note that
13296there is no @code{xorg-service} procedure. Instead, the X server is 13296there is no @code{xorg-service} procedure. Instead, the X server is
13297started by the @dfn{login manager}, by default SLiM. 13297started by the @dfn{login manager}, by default the GNOME Display Manager (GDM).
13298
13299@cindex GDM
13300@cindex GNOME, login manager
13301GDM of course allows users to log in into window managers and desktop
13302environments other than GNOME; for those using GNOME, GDM is required for
13303features such as automatic screen locking.
13298 13304
13299@cindex window manager 13305@cindex window manager
13300To use X11, you must install at least one @dfn{window manager}---for 13306To use X11, you must install at least one @dfn{window manager}---for
@@ -14406,7 +14412,7 @@ This is a list of services that builds upon @var{%base-services} and
14406adds or adjusts services for a typical ``desktop'' setup. 14412adds or adjusts services for a typical ``desktop'' setup.
14407 14413
14408In particular, it adds a graphical login manager (@pxref{X Window, 14414In particular, it adds a graphical login manager (@pxref{X Window,
14409@code{slim-service}}), screen lockers, a network management tool 14415@code{gdm-service-type}}), screen lockers, a network management tool
14410(@pxref{Networking Services, @code{network-manager-service-type}}), energy and color 14416(@pxref{Networking Services, @code{network-manager-service-type}}), energy and color
14411management services, the @code{elogind} login and seat manager, the 14417management services, the @code{elogind} login and seat manager, the
14412Polkit privilege service, the GeoClue location service, the 14418Polkit privilege service, the GeoClue location service, the
@@ -14445,8 +14451,8 @@ functionality to work as expetected.
14445 14451
14446The desktop environments in Guix use the Xorg display server by 14452The desktop environments in Guix use the Xorg display server by
14447default. If you'd like to use the newer display server protocol 14453default. If you'd like to use the newer display server protocol
14448called Wayland, you need to use the @code{sddm-service} instead of the 14454called Wayland, you need to use the @code{sddm-service} instead of
14449@code{slim-service} for the graphical login manager. You should then 14455GDM as the graphical login manager. You should then
14450select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can 14456select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can
14451also try starting GNOME on Wayland manually from a TTY with the 14457also try starting GNOME on Wayland manually from a TTY with the
14452command ``XDG_SESSION_TYPE=wayland exec dbus-run-session 14458command ``XDG_SESSION_TYPE=wayland exec dbus-run-session