shepherd: Init.

.config/shepherd/init.scm

@@ -0,0 +1,22 @@
+;;; Shepherd User Services
+
+;; See https://github.com/alezost/shepherd-config.
+(load "services.scm")
+
+;; Services known to shepherd:
+;; Add new services (defined using 'make <service>') to shepherd here by
+;; providing them as arguments to 'register-services'.
+(apply register-services
+       (append main-services
+               display-services
+               laptop-services))
+
+;; Send shepherd into the background.
+(action 'shepherd 'daemonize)
+
+;; Services to start when shepherd starts:
+;; (start 'main-services)
+(for-each start
+          (append main-services
+                  display-services
+                  laptop-services))

.config/shepherd/services.scm

@@ -0,0 +1,158 @@
+(use-modules
+ (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26))
+
+(define* (mapconcat proc lst #:optional (separator ""))
+  "Apply PROC to each element of LST and concatenate the result strings
+into a single string using SEPARATOR."
+  (match lst
+    (() "")
+    ((elt . rest)
+     (fold (lambda (elt res)
+             (string-append res separator (proc elt)))
+           (proc elt)
+           rest))))
+
+(define (build-file-name . file-parts)
+  "Return file name by concatenating FILE-PARTS with slashes."
+  (mapconcat identity file-parts "/"))
+
+(define (home-file . file-parts)
+  "Return file name from my home directory."
+  (apply build-file-name (getenv "HOME") file-parts))
+
+;; (define* (make-service                  ; TODO: Test this.
+;;            #:key start
+;;            #:allow-other-keys
+;;            #:rest args)
+;;   "START is a list of strings that make up for the command line to start the service."
+;;   (apply make <service>
+;;          #:start (make-system-constructor
+;;                   (mapconcat identity start " "))
+;;          args))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define xrdb
+  (make <service>
+    #:docstring "X resources for xterm.
+Some DM merge this automatically; we merge it for the others."
+    #:provides '(xrdb)
+    #:start (make-system-constructor
+             (string-join (list "xrdb" "-merge" (home-file ".Xresources"))))
+    #:one-shot? #t))
+
+(define setxkbmap
+  (make <service>
+    #:docstring "Set keymap for X."
+    #:provides '(setxkbmap)
+    #:start (make-system-constructor
+             (string-join '("setxkbmap"
+                            "-layout" "us"
+                            "-variant" "altgr-intl"
+                            "-option" "ctrl:swapcaps,nodeadkeys,nbsp:level3")))
+    #:one-shot? #t))
+
+;; (define xcape-service-type
+;;   (shepherd-service-type
+;;    'xcape-service
+;;    (lambda (rules)
+;;      (define rule
+;;        (string-join (map (lambda (keys) (string-append (car keys) "=" (cdr keys)))
+;;                          rules)
+;;                     ";"))
+;;      (define xcape-command
+;;        #~(list #$(file-append xcape "/bin/xcape") "-e" #$rule))
+;;
+;;      (shepherd-service
+;;       (provision '(xcape))
+;;       (requirement '(xorg-server user-processes))
+;;       (documentation (string-append "Keep xcape alive for rule: " rule))
+;;       (start
+;;        #~(make-forkexec-constructor
+;;           #$xcape-command
+;;           #:log-file "/var/log/xcape.log"))
+;;       (stop #~(make-kill-destructor))))))
+
+(define xcape
+  (make <service>
+    #:provides '(xcape)
+    #:requires '(setxkbmap)
+    #:start (make-system-constructor "xcape -e 'Control_L=Escape'")
+    #:stop (make-system-destructor "pkill xcape")
+    #:respawn? #t))
+
+(define numlock
+  (make <service>
+    #:provides '(numlock numlockx)
+    #:start (make-system-constructor "numlockx on")
+    #:one-shot? #t))
+
+(define xbindkeys
+  (make <service>
+    #:provides '(xbindkeys)
+    #:requires '(setxkbmap)
+    #:start (make-system-constructor "xbindkeys")
+    #:stop (make-system-destructor "pkill xbindkeys")))
+
+(define privoxy
+  (make <service>
+    #:provides '(privoxy)
+    #:docstring "Privoxy filters outgoing Internet connections"
+    ;; TODO: Fix make-forkexec-constructor for privoxy.
+    ;; #:start (make-forkexec-constructor
+    ;;          '("privoxy" "--no-daemon"
+    ;;            (home-file  ".config/privoxy/config"))
+    ;;          ;; #:log-file (home-file ".cache/privoxy/privoxy.log")
+    ;;          )
+    #:start (make-system-constructor "privoxy --no-daemon ~/.config/privoxy/config &")
+    #:stop (make-system-destructor "pkill privoxy")
+    #:respawn? #t))
+
+(define no-bell
+  (make <service>
+    #:provides '(no-bell)
+    #:start (make-system-constructor "xset -b")
+    #:one-shot? #t))
+
+(define auto-lock
+  (make <service>
+    #:provides '(auto-lock)
+    #:start (make-system-constructor "xss-lock slock &")
+    #:stop (make-system-destructor "pkill xss-lock")
+    #:respawn? #t))
+
+(define auto-mount
+  (make <service>
+    #:provides '(auto-mount)
+    #:start (make-system-constructor "udiskie &")
+    #:stop (make-system-destructor "pkill udiskie")
+    #:respawn? #t))
+
+(define cron
+  (make <service>
+    #:provides '(cron)
+    #:docstring "Crontab manager.
+Start after PATH is fully set or else local programs could
+be missing."
+    #:start (make-system-constructor "mcron &")
+    #:stop (make-system-destructor "pkill mcron")
+    #:respawn? #t))
+
+(define main-services (list
+                       privoxy
+                       auto-mount
+                       cron))
+
+(define display-services (list
+                          xrdb
+                          setxkbmap
+                          xcape
+                          numlock
+                          xbindkeys
+                          no-bell
+                          auto-lock))
+
+(define laptop-services (list
+                         xbindkeys))

.profile

@@ -40,14 +40,6 @@ prependpath "${HOME}/personal/hackpool"
 ## Last PATH entries.
 appendpath "${HOME}/.local/bin"
 
-## mcron: needs to be run after PATH is fully set or else local programs could
-## be missing.
-if command -v mcron >/dev/null 2>&1; then
-	# TODO: Only start if not already started?
-	# pkill mcron
-	mcron &
-fi
-
 ## Remove less history.
 LESSHISTFILE='-'
 
@@ -71,11 +63,6 @@ if [ "$(uname -o)" = "GNU/Linux" ] ; then
 	log_dmesg="$(dmesg | grep -i error)"
 	[ -n "$log_dmesg" ] && echo "$log_dmesg" > "$HOME/errors-dmesg.log" || rm "$HOME/errors-dmesg.log" 2>/dev/null
 	unset log_dmesg
-
-	## External device auto-mounting.
-	if command -v udiskie >/dev/null 2>&1; then
-		udiskie &
-	fi
 fi
 
 ## Wine DLL overrides.

.xprofile

@@ -4,7 +4,7 @@
 ## Internet browsers that need X to run.
 export BROWSER=next
 
-## ~/.local/share/applications/mimeapps.list shoud symlink to ~/.config/mimeapps.list.
+## ~/.local/share/applications/mimeapps.list should symlink to ~/.config/mimeapps.list.
 cat<<EOF > ~/.config/mimeapps.list
 [Added Associations]
 image/jpeg=sxiv.desktop
@@ -24,29 +24,9 @@ x-scheme-handler/https=$BROWSER.desktop
 x-scheme-handler/mailto=emacs-mail.desktop
 EOF
 
-## X resources for xterm.
-## Some DM merge this automatically; we merge it for TTY logins.
-[ -f "$HOME/.Xresources" ] && xrdb -merge "$HOME/.Xresources"
-
-## Set custom keymap and configure input devices.
-setxkbmap -layout us -variant "altgr-intl" -option "ctrl:swapcaps,nodeadkeys,nbsp:level3"
-xcape -e 'Control_L=Escape'
-numlockx on
-xbindkeys
-## Disable the touchpad.  There might be better ways to do this.
-# xinput disable "SynPS/2 Synaptics TouchPad"
-
-## Turn off the bell.
-xset -b
-
-## Lock screen on sleep.
-xss-lock slock &
-
-## PulseAudio.  It should start automatically.
-# start-pulseaudio-x11 &
-
-## Privoxy
-privoxy --no-daemon ~/.config/privoxy/config &
+## Start user services.
+## For now, we need to start it here after X has started since it has graphical services.
+shepherd
 
 ## Hook. Should be sourced last.
 [ -f ~/.xprofile_hook ] && . ~/.xprofile_hook