simplify service definitions

.gitignore

@@ -17,6 +17,7 @@ vim/spell
 services/*/supervise
 services/*/lock
 services/*/current
+services/*/down
 
 # other
 *.pyc

services/notmuch/notmuch

@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-# check for internet connection
-ip route ls | grep -q '.'
-
-# check if the gpg-agent is running
-pgrep gpg-agent > /dev/null
-
-notmuch new --quiet 2>&1
-
-exec sleep 1m

services/notmuch/run

@@ -1,9 +1,17 @@
 #!/bin/sh
-exec env                                                       \
+export USER="$(whoami)"
-    HOME="${HOME:-/home/noctua}"                               \
+export HOME=/home/"$USER"
-    XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-/home/noctua/.config}" \
+export DISPLAY=":0"
-    LC_ALL="en_US.utf-8"                                       \
+. "$HOME"/.profile
-    LANG="en_US.utf-8"                                         \
+
-    PATH="/usr/local/bin:$HOME/.local/bin:$PATH"               \
+set -e
-    DISPLAY="${DISPLAY:-:0}"                                   \
+
-    ./notmuch
+# check for internet connection
+ip route ls | grep -q '.'
+
+# check if the gpg-agent is running
+pgrep gpg-agent > /dev/null
+
+notmuch new --quiet 2>&1
+
+exec sleep 1m

services/spotifyd/run

@@ -1,9 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
-exec > /dev/null
+export USER="$(whoami)"
-exec env -i                                                    \
+export HOME=/home/"$USER"
-    HOME="${HOME:-/home/noctua}"                               \
+export DISPLAY=":0"
-    XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-/home/noctua/.config}" \
+. "$HOME/.profile"
-    XDG_CACHE_HOME="${XDG_CONFIG_HOME:-/home/noctua/.cache}"   \
+
-    PATH="/usr/local/bin:$HOME/.cargo/bin:$PATH"               \
+spotifyd --no-daemon 2>&1 \
-    DISPLAY=":0"                                               \
+	| tee -a $XDG_RUNTIME_DIR/playlist \
-    /home/noctua/.cargo/bin/spotifyd --no-daemon
+	| sed '/trunc/d;/loaded$/d;/^Loading/d'

services/vdirsyncer/run

@@ -1,9 +1,17 @@
 #!/bin/sh
-exec env                                                       \
+export USER="$(whoami)"
-    HOME="${HOME:-/home/noctua}"                               \
+export HOME=/home/"$USER"
-    XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-/home/noctua/.config}" \
+export DISPLAY=":0"
-    LC_ALL="en_US.utf-8"                                       \
+. "$HOME"/.profile
-    LANG="en_US.utf-8"                                         \
+
-    PATH="/usr/local/bin:$HOME/.local/bin:$PATH"               \
+set -e
-    DISPLAY="${DISPLAY:-:0}"                                   \
+
-    ./vdirsyncer
+# check for internet connection
+ip route ls | grep -q '.'
+
+# check if the gpg-agent is running
+pgrep gpg-agent > /dev/null
+
+vdirsyncer -v CRITICAL sync 2>&1
+
+exec sleep 10m

services/vdirsyncer/vdirsyncer

@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-# check for internet connection
-ip route ls | grep -q '.'
-
-# check if the gpg-agent is running
-pgrep gpg-agent > /dev/null
-
-vdirsyncer -v CRITICAL sync 2>&1
-
-exec sleep 10m