diff options
Diffstat (limited to '.config/systemd/user')
25 files changed, 112 insertions, 37 deletions
diff --git a/.config/systemd/user/X11@.target b/.config/systemd/user/X11@.target new file mode 100644 index 0000000..d84f814 --- /dev/null +++ b/.config/systemd/user/X11@.target @@ -0,0 +1,2 @@ +[Unit] +Description=Connection to X11 display %I diff --git a/.config/systemd/user/wm@.target.requires/wmii@.service b/.config/systemd/user/X11@.target.requires/wmii@.service index 1b202d2..1b202d2 120000 --- a/.config/systemd/user/wm@.target.requires/wmii@.service +++ b/.config/systemd/user/X11@.target.requires/wmii@.service diff --git a/.config/systemd/user/X11@.target.wants/xmodmap@.service b/.config/systemd/user/X11@.target.wants/xmodmap@.service new file mode 120000 index 0000000..3eb09e4 --- /dev/null +++ b/.config/systemd/user/X11@.target.wants/xmodmap@.service @@ -0,0 +1 @@ +../xmodmap@.service
\ No newline at end of file diff --git a/.config/systemd/user/X11@.target.wants/xresources-dpi@.service b/.config/systemd/user/X11@.target.wants/xresources-dpi@.service new file mode 120000 index 0000000..f3b5a4c --- /dev/null +++ b/.config/systemd/user/X11@.target.wants/xresources-dpi@.service @@ -0,0 +1 @@ +../xresources-dpi@.service
\ No newline at end of file diff --git a/.config/systemd/user/X11@.target.wants/xresources@.service b/.config/systemd/user/X11@.target.wants/xresources@.service new file mode 120000 index 0000000..807639b --- /dev/null +++ b/.config/systemd/user/X11@.target.wants/xresources@.service @@ -0,0 +1 @@ +../xresources@.service
\ No newline at end of file diff --git a/.config/systemd/user/basic.target.wants/import-profile.service b/.config/systemd/user/basic.target.wants/import-profile.service new file mode 120000 index 0000000..04009d1 --- /dev/null +++ b/.config/systemd/user/basic.target.wants/import-profile.service @@ -0,0 +1 @@ +../import-profile.service
\ No newline at end of file diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service index 568af3f..74d2447 100644 --- a/.config/systemd/user/dunst@.service +++ b/.config/systemd/user/dunst@.service @@ -1,10 +1,11 @@ [Unit] Description=Dunst notification-daemon on X display %I Documentation=man:dunst(1) -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I -ExecStart=/usr/bin/dunst -Restart=always + +Type=simple +ExecStart=/usr/bin/env dunst diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service index 4077e97..3869d75 100644 --- a/.config/systemd/user/emacs-daemon.service +++ b/.config/systemd/user/emacs-daemon.service @@ -3,8 +3,9 @@ Description=Emacs deamon [Service] Type=forking -ExecStart=/bin/bash -l -c 'emacs --daemon' -ExecStop=/bin/bash -l -c 'emacsclient -a false -e "(kill-emacs)"' +ExecStart=/usr/bin/env emacs --daemon +ExecStop=/usr/bin/env emacsclient -a false -e '(kill-emacs)' +Restart=always [Install] WantedBy=default.target diff --git a/.config/systemd/user/import-profile.service b/.config/systemd/user/import-profile.service new file mode 100644 index 0000000..acde590 --- /dev/null +++ b/.config/systemd/user/import-profile.service @@ -0,0 +1,11 @@ +[Unit] +Description=Load user profile into systemd +Before=basic.target +DefaultDependencies=no + +[Service] +Type=oneshot +ExecStart=/usr/bin/env bash -l -c systemd-import-profile + +[Install] +WantedBy=basic.target diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service index ecded87..76df925 100644 --- a/.config/systemd/user/lxpanel@.service +++ b/.config/systemd/user/lxpanel@.service @@ -2,14 +2,16 @@ Description=LXDE Desktop Panel on X display %I Documentation=man:lxpanel(1) StopWhenUnneeded=true -After=wm@%i.target +After=X11@%i.target wm-running@%i.target +Requisite=X11@%i.target +Requires=wm-running@%i.target Before=panel@%i.target [Service] -Type=simple Environment=DISPLAY=%I -ExecStart=/usr/bin/lxpanel -Restart=always + +Type=simple +ExecStart=/usr/bin/env lxpanel [Install] RequiredBy=panel@%i.target diff --git a/.config/systemd/user/maildirproc@.service b/.config/systemd/user/maildirproc@.service index 9c4181c..450157f 100644 --- a/.config/systemd/user/maildirproc@.service +++ b/.config/systemd/user/maildirproc@.service @@ -3,7 +3,7 @@ Description=maildirproc mail filter [Service] Type=simple -ExecStart=/usr/bin/maildirproc --rcfile=${HOME}/.config/maildirproc/%I.rc --logfile=- +ExecStart=/usr/bin/env maildirproc --rcfile=${HOME}/.config/maildirproc/%I.rc --logfile=- Restart=on-failure [Install] diff --git a/.config/systemd/user/panel@.target b/.config/systemd/user/panel@.target index ed3dffd..53d45b0 100644 --- a/.config/systemd/user/panel@.target +++ b/.config/systemd/user/panel@.target @@ -1,3 +1,5 @@ [Unit] -Description=Desktop Panel (System Tray) on display %I +Description=Desktop Panel (System Tray) on X display %I StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target diff --git a/.config/systemd/user/rbar@.service b/.config/systemd/user/rbar@.service index 18d6201..55b802c 100644 --- a/.config/systemd/user/rbar@.service +++ b/.config/systemd/user/rbar@.service @@ -4,4 +4,4 @@ StopWhenUnneeded=true [Service] Type=simple -ExecStart=/usr/bin/bash -c '%h/.wmii-hg/rbar %I' +ExecStart=/bin/sh -c '%h/.wmii-hg/rbar %I' diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service index b4ef3bb..fda41d6 100644 --- a/.config/systemd/user/redshift@.service +++ b/.config/systemd/user/redshift@.service @@ -1,11 +1,12 @@ [Unit] Description=Redshift display colour temperature adjustment on X display %I Documentation=http://jonls.dk/redshift/ -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I -ExecStart=/usr/bin/redshift -ExecStopPost=/usr/bin/redshift -x -Restart=always + +Type=simple +ExecStart=/usr/bin/env redshift +ExecStopPost=/usr/bin/env redshift -x diff --git a/.config/systemd/user/synergy@.service b/.config/systemd/user/synergy@.service index df0640a..c045749 100644 --- a/.config/systemd/user/synergy@.service +++ b/.config/systemd/user/synergy@.service @@ -1,10 +1,12 @@ [Unit] Description=Keyboard and mouse sharing on X display %I -StopWhenUnneeded=true +#StopWhenUnneeded=true +After=X11@%i.target panel@%i.target +Requisite=X11@%i.target Requires=panel@%i.target [Service] -Type=simple Environment=DISPLAY=%I -ExecStart=/usr/bin/synergy -Restart=always + +Type=simple +ExecStart=/usr/bin/env synergy diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index 2433977..2b5b453 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -6,7 +6,7 @@ Conflicts=x0vncserver@%i.service Type=simple Restart=always -ExecStart=/bin/bash -l -c 'vncserver -fg %I' +ExecStart=/usr/bin/env vncserver -fg %I ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I [Install] diff --git a/.config/systemd/user/wm-running@.target b/.config/systemd/user/wm-running@.target new file mode 100644 index 0000000..8d3a38b --- /dev/null +++ b/.config/systemd/user/wm-running@.target @@ -0,0 +1,2 @@ +[Unit] +Description=Window Manager is running on X display %I diff --git a/.config/systemd/user/wm-running@.target.requires/wmii@.service b/.config/systemd/user/wm-running@.target.requires/wmii@.service new file mode 120000 index 0000000..1b202d2 --- /dev/null +++ b/.config/systemd/user/wm-running@.target.requires/wmii@.service @@ -0,0 +1 @@ +../wmii@.service
\ No newline at end of file diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target deleted file mode 100644 index c114bf5..0000000 --- a/.config/systemd/user/wm@.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Window Manager on display %I diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 4a81e3f..c939221 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -1,17 +1,19 @@ [Unit] Description=Window Manager Improved Improved on X display %I Documentation=file:/usr/share/doc/wmii/wmii.pdf -Before=wm@%i.target -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target +Before=wm-running@%i.target [Service] +Environment=DISPLAY=%I + # This assumes that you write READY=1 to $NOTIFY_SOCKET in wmiirc Type=notify NotifyAccess=all -Environment=DISPLAY=%I -ExecStart=/usr/bin/bash -l -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii' -ExecStop=/usr/bin/wmiir xwrite /ctl Quit +ExecStart=/usr/bin/env bash -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii' +ExecStop=/usr/bin/env wmiir xwrite /ctl Quit [Install] -RequiredBy=wm@%i.service +RequiredBy=X11@%i.target diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 3ee349f..1582f42 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,9 +1,10 @@ [Unit] Description=VNC server for real X display %I Conflicts=vncserver@%i.service -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] + Type=simple -ExecStart=/usr/bin/x0vncserver display=%I PasswordFile=%h/.vnc/passwd -Restart=always +ExecStart=/usr/bin/env x0vncserver display=%I PasswordFile=%h/.vnc/passwd diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service index 85decd2..c3d98d4 100644 --- a/.config/systemd/user/xcompmgr@.service +++ b/.config/systemd/user/xcompmgr@.service @@ -2,9 +2,11 @@ Description=Composite Window-Effects Manger on X display %I Documentation=man:xcompmgr(1) StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I -ExecStart=/usr/bin/xcompmgr -Restart=always + +Type=simple +ExecStart=/usr/bin/env xcompmgr diff --git a/.config/systemd/user/xmodmap@.service b/.config/systemd/user/xmodmap@.service new file mode 100644 index 0000000..57bab8f --- /dev/null +++ b/.config/systemd/user/xmodmap@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Load XModMap keyboard map on X display %I +Documentation=man:xmodmap(1) +After=X11@%i.target +Requisite=X11@%i.target + +[Service] +Environment=DISPLAY=%I + +Type=oneshot +ExecStart=-/usr/bin/env xmodmap ${XDG_CONFIG_HOME}/X11/modmap + +[Install] +WantedBy=X11@%i.target diff --git a/.config/systemd/user/xresources-dpi@.service b/.config/systemd/user/xresources-dpi@.service new file mode 100644 index 0000000..82f2096 --- /dev/null +++ b/.config/systemd/user/xresources-dpi@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Set the X Resources DataBase DPI to match the display DPI on X display %I +Documentation=man:xrdb(1) +Before=X11@%i.target +Requisite=X11@%i.target +Conflicts=xresources@:i.service + +[Service] +Environment=DISPLAY=%I + +Type=oneshot +ExecStart=/usr/bin/env xrdb-set-dpi + +[Install] +WantedBy=X11@%i.target diff --git a/.config/systemd/user/xresources@.service b/.config/systemd/user/xresources@.service new file mode 100644 index 0000000..760fd0f --- /dev/null +++ b/.config/systemd/user/xresources@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Load X Resources DataBase on X display %I +Documentation=man:xrdb(1) +Before=X11@%i.target +Requisite=X11@%i.target + +[Service] +Environment=DISPLAY=%I + +Type=oneshot +ExecStart=/usr/bin/env xrdb -merge ${XDG_CONFIG_HOME}/X11/resources + +[Install] +WantedBy=X11@%i.target |