ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: slim: Use a system-wide xinitrc that defaults to wmaker.

Browse source 
* gnu/services/xorg.scm (xinitrc): New procedure.
  (slim-service)[slim.cfg]: Use it as the 'login_cmd'.
This commit is contained in:
Ludovic Courtès 2014-04-06 23:31:58 +02:00
parent a0b25016eb
commit 9e4eddb4fc
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/services/xorg.scm
View file

@ -24,6 +24,7 @@ (define-module (gnu services xorg)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages slim) #:use-module (gnu packages slim)
#:use-module (gnu packages ratpoison) #:use-module (gnu packages ratpoison)
#:use-module (gnu packages gnustep)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (guix monads) #:use-module (guix monads)
@ -126,6 +127,37 @@ (define builder
(derivation-expression "start-xorg" builder (derivation-expression "start-xorg" builder
#:inputs inputs)))) #:inputs inputs))))
(define* (xinitrc #:key
(guile guile-final)
(ratpoison ratpoison)
(windowmaker windowmaker))
"Return a system-wide xinitrc script that starts the specified X session."
(mlet %store-monad ((guile-bin (package-file guile "bin/guile"))
(ratpoison-bin (package-file ratpoison "bin/ratpoison"))
(wmaker-bin (package-file windowmaker "bin/wmaker"))
(inputs (lower-inputs
`(("raptoison" ,ratpoison)
("wmaker" ,windowmaker)))))
(define builder
`(let ((out (assoc-ref %outputs "out")))
(call-with-output-file out
(lambda (port)
(format port "#!~a --no-auto-compile~%!#~%" ,guile-bin)
(write '(begin
(use-modules (ice-9 match))
;; TODO: Check for ~/.xsession.
(match (command-line)
((_ "ratpoison")
(execl ,ratpoison-bin))
(_
(execl ,wmaker-bin))))
port)))
(chmod out #o555)
#t))
(derivation-expression "xinitrc" builder #:inputs inputs)))
(define* (slim-service #:key (slim slim) (define* (slim-service #:key (slim slim)
(allow-empty-passwords? #t) auto-login? (allow-empty-passwords? #t) auto-login?
(default-user "") (default-user "")
@ -138,8 +170,8 @@ (define* (slim-service #:key (slim slim)
When ALLOW-EMPTY-PASSWORDS? is true, allow logins with an empty password. When ALLOW-EMPTY-PASSWORDS? is true, allow logins with an empty password.
When AUTO-LOGIN? is true, log in automatically as DEFAULT-USER." When AUTO-LOGIN? is true, log in automatically as DEFAULT-USER."
(define (slim.cfg) (define (slim.cfg)
;; TODO: Run "bash -login ~/.xinitrc %session". (mlet %store-monad ((startx (or startx (xorg-start-command)))
(mlet %store-monad ((startx (or startx (xorg-start-command)))) (xinitrc (xinitrc)))
(text-file* "slim.cfg" " (text-file* "slim.cfg" "
default_path /run/current-system/bin default_path /run/current-system/bin
default_xserver " startx " default_xserver " startx "
@ -149,7 +181,8 @@ (define (slim.cfg)
# The login command. '%session' is replaced by the chosen session name, one # The login command. '%session' is replaced by the chosen session name, one
# of the names specified in the 'sessions' setting: 'wmaker', 'xfce', etc. # of the names specified in the 'sessions' setting: 'wmaker', 'xfce', etc.
login_cmd exec " ratpoison "/bin/ratpoison login_cmd exec " xinitrc "%session
sessions wmaker,ratpoison
halt_cmd " dmd "/sbin/halt halt_cmd " dmd "/sbin/halt
reboot_cmd " dmd "/sbin/reboot reboot_cmd " dmd "/sbin/reboot