aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-01-27 21:46:44 +0300
committerAlex Kost <alezost@gmail.com>2016-01-29 20:21:53 +0300
commit26b94866ad18666e1e427f3377ad21b8532cc3fb (patch)
treedeec8b2f511fe46f4789d89455caf04565e6e214
parentfe1ad5f5db1cf38a291ee5548729d24e03d3c448 (diff)
downloadgnu-guix-26b94866ad18666e1e427f3377ad21b8532cc3fb.tar
gnu-guix-26b94866ad18666e1e427f3377ad21b8532cc3fb.tar.gz
services: xorg: Use 'shepherd' instead of 'dmd'.
* gnu/services/xorg.scm (slim-configuration-dmd): Rename to... (slim-configuration-shepherd): ... this. (slim-shepherd-service): Adjust accordingly. (slim-service): Take 'shepherd' keyword argument.
-rw-r--r--gnu/services/xorg.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 4b81bd90d4..fbe6fad463 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -236,8 +236,8 @@ which should be passed to this script as the first argument. If not, the
(theme-name slim-configuration-theme-name)
(xauth slim-configuration-xauth
(default xauth))
- (dmd slim-configuration-dmd
- (default dmd))
+ (shepherd slim-configuration-shepherd
+ (default shepherd))
(bash slim-configuration-bash
(default bash))
(auto-login-session slim-configuration-auto-login-session)
@@ -257,7 +257,7 @@ which should be passed to this script as the first argument. If not, the
(slim (slim-configuration-slim config))
(xauth (slim-configuration-xauth config))
(startx (slim-configuration-startx config))
- (dmd (slim-configuration-dmd config))
+ (shepherd (slim-configuration-shepherd config))
(theme-name (slim-configuration-theme-name config)))
(mixed-text-file "slim.cfg" "
default_path /run/current-system/profile/bin
@@ -272,8 +272,8 @@ login_cmd exec " xinitrc " %session
sessiondir /run/current-system/profile/share/xsessions
session_msg session (F1 to change):
-halt_cmd " dmd "/sbin/halt
-reboot_cmd " dmd "/sbin/reboot\n"
+halt_cmd " shepherd "/sbin/halt
+reboot_cmd " shepherd "/sbin/reboot\n"
(if (slim-configuration-auto-login? config)
(string-append "auto_login yes\ndefault_user "
(slim-configuration-default-user config) "\n")
@@ -323,7 +323,7 @@ reboot_cmd " dmd "/sbin/reboot\n"
(default-user "")
(theme %default-slim-theme)
(theme-name %default-slim-theme-name)
- (xauth xauth) (dmd dmd) (bash bash)
+ (xauth xauth) (shepherd shepherd) (bash bash)
(auto-login-session #~(string-append #$windowmaker
"/bin/wmaker"))
(startx (xorg-start-command)))
@@ -358,7 +358,7 @@ theme."
(allow-empty-passwords? allow-empty-passwords?)
(auto-login? auto-login?) (default-user default-user)
(theme theme) (theme-name theme-name)
- (xauth xauth) (dmd dmd) (bash bash)
+ (xauth xauth) (shepherd shepherd) (bash bash)
(auto-login-session auto-login-session)
(startx startx))))