Skip to content
Snippets Groups Projects
Commit 26b94866 authored by Alex Kost's avatar Alex Kost
Browse files

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.
parent fe1ad5f5
No related branches found
No related tags found
No related merge requests found
...@@ -236,8 +236,8 @@ (define-record-type* <slim-configuration> ...@@ -236,8 +236,8 @@ (define-record-type* <slim-configuration>
(theme-name slim-configuration-theme-name) (theme-name slim-configuration-theme-name)
(xauth slim-configuration-xauth (xauth slim-configuration-xauth
(default xauth)) (default xauth))
(dmd slim-configuration-dmd (shepherd slim-configuration-shepherd
(default dmd)) (default shepherd))
(bash slim-configuration-bash (bash slim-configuration-bash
(default bash)) (default bash))
(auto-login-session slim-configuration-auto-login-session) (auto-login-session slim-configuration-auto-login-session)
...@@ -257,7 +257,7 @@ (define slim.cfg ...@@ -257,7 +257,7 @@ (define slim.cfg
(slim (slim-configuration-slim config)) (slim (slim-configuration-slim config))
(xauth (slim-configuration-xauth config)) (xauth (slim-configuration-xauth config))
(startx (slim-configuration-startx config)) (startx (slim-configuration-startx config))
(dmd (slim-configuration-dmd config)) (shepherd (slim-configuration-shepherd config))
(theme-name (slim-configuration-theme-name config))) (theme-name (slim-configuration-theme-name config)))
(mixed-text-file "slim.cfg" " (mixed-text-file "slim.cfg" "
default_path /run/current-system/profile/bin default_path /run/current-system/profile/bin
...@@ -272,8 +272,8 @@ (define slim.cfg ...@@ -272,8 +272,8 @@ (define slim.cfg
sessiondir /run/current-system/profile/share/xsessions sessiondir /run/current-system/profile/share/xsessions
session_msg session (F1 to change): session_msg session (F1 to change):
halt_cmd " dmd "/sbin/halt halt_cmd " shepherd "/sbin/halt
reboot_cmd " dmd "/sbin/reboot\n" reboot_cmd " shepherd "/sbin/reboot\n"
(if (slim-configuration-auto-login? config) (if (slim-configuration-auto-login? config)
(string-append "auto_login yes\ndefault_user " (string-append "auto_login yes\ndefault_user "
(slim-configuration-default-user config) "\n") (slim-configuration-default-user config) "\n")
...@@ -323,7 +323,7 @@ (define* (slim-service #:key (slim slim) ...@@ -323,7 +323,7 @@ (define* (slim-service #:key (slim slim)
(default-user "") (default-user "")
(theme %default-slim-theme) (theme %default-slim-theme)
(theme-name %default-slim-theme-name) (theme-name %default-slim-theme-name)
(xauth xauth) (dmd dmd) (bash bash) (xauth xauth) (shepherd shepherd) (bash bash)
(auto-login-session #~(string-append #$windowmaker (auto-login-session #~(string-append #$windowmaker
"/bin/wmaker")) "/bin/wmaker"))
(startx (xorg-start-command))) (startx (xorg-start-command)))
...@@ -358,7 +358,7 @@ (define* (slim-service #:key (slim slim) ...@@ -358,7 +358,7 @@ (define* (slim-service #:key (slim slim)
(allow-empty-passwords? allow-empty-passwords?) (allow-empty-passwords? allow-empty-passwords?)
(auto-login? auto-login?) (default-user default-user) (auto-login? auto-login?) (default-user default-user)
(theme theme) (theme-name theme-name) (theme theme) (theme-name theme-name)
(xauth xauth) (dmd dmd) (bash bash) (xauth xauth) (shepherd shepherd) (bash bash)
(auto-login-session auto-login-session) (auto-login-session auto-login-session)
(startx startx)))) (startx startx))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment