summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-19 21:26:33 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-24 23:06:11 +0100
commit554b8607396785dcde6eb391f75f98a07ec582fd (patch)
tree6414d2a71ca0ee56e7e677a0db7e10b2a11c123e /doc
parentb2e564515a811c75ed9bd30969bc48ac4eadebfb (diff)
downloadpatches-554b8607396785dcde6eb391f75f98a07ec582fd.tar
patches-554b8607396785dcde6eb391f75f98a07ec582fd.tar.gz
services: sddm, slim, gdm: Take an <xorg-configuration> record.
* gnu/services/sddm.scm (<sddm-configuration>)[xorg-server-path] [xserver-arguments]: Remove. [xorg-configuration]: New field. (sddm-configuration-file): Adjust accordingly. * gnu/services/xorg.scm (<slim-configuration>)[startx]: Remove. [xorg-configuration]: New field. (slim-shepherd-service, slim-service): Adjust accordingly. (<gdm-configuration>)[x-server]: Remove. [xorg-configuration]: New field. (gdm-shepherd-service, gdm-service): Adjust accordingly. * doc/guix.texi (X Window): Update accordingly.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi11
1 files changed, 4 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index b49f651562..5511aaaf57 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13223,8 +13223,8 @@ your user profile. Failing to do that, if @code{auto-login-session} is
false, you will be unable to log in.
@end quotation
-@item @code{startx} (default: @code{(xorg-start-command)})
-The command used to start the X11 graphical server.
+@item @code{xorg-configuration} (default @code{(xorg-configuration)})
+Configuration of the Xorg graphical server.
@item @code{xauth} (default: @code{xauth})
The XAuth package to use.
@@ -13300,8 +13300,8 @@ Script to run before starting a wayland session.
@item @code{sessions-directory} (default "/run/current-system/profile/share/wayland-sessions")
Directory to look for desktop files starting wayland sessions.
-@item @code{xorg-server-path} (default @code{xorg-start-command})
-Path to xorg-server.
+@item @code{xorg-configuration} (default @code{(xorg-configuration)})
+Configuration of the Xorg graphical server.
@item @code{xauth-path} (default @code{#~(string-append #$xauth "/bin/xauth")})
Path to xauth.
@@ -13324,9 +13324,6 @@ Directory to look for desktop files starting X sessions.
@item @code{minimum-vt} (default: 7)
Minimum VT to use.
-@item @code{xserver-arguments} (default "-nolisten tcp")
-Arguments to pass to xorg-server.
-
@item @code{auto-login-user} (default "")
User to use for auto-login.