Merge remote-tracking branch 'origin/master' into build64-par/master

8 files changed, 19 insertions, 10 deletions

diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service
index 2aff6be..568af3f 100644
--- a/.config/systemd/user/dunst@.service
+++ b/.config/systemd/user/dunst@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Dunst notification-daemon
+Description=Dunst notification-daemon on X display %I
 Documentation=man:dunst(1)
 StopWhenUnneeded=true
 
diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service
index 3327ab4..71e2114 100644
--- a/.config/systemd/user/lxpanel@.service
+++ b/.config/systemd/user/lxpanel@.service
@@ -1,7 +1,8 @@
 [Unit]
-Description=LXDE Desktop Panel
+Description=LXDE Desktop Panel on X display %I
 Documentation=man:lxpanel(1)
 StopWhenUnneeded=true
+After=wm@%i.target
 
 [Service]
 Type=simple
diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service
index 149bb74..b4ef3bb 100644
--- a/.config/systemd/user/redshift@.service
+++ b/.config/systemd/user/redshift@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Redshift display colour temperature adjustment
+Description=Redshift display colour temperature adjustment on X display %I
 Documentation=http://jonls.dk/redshift/
 StopWhenUnneeded=true
 
diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service
index 8c1d818..2433977 100644
--- a/.config/systemd/user/vncserver@.service
+++ b/.config/systemd/user/vncserver@.service
@@ -1,11 +1,12 @@
 [Unit]
-Description=VNC desktop
+Description=VNC virtual desktop %I
 Conflicts=x0vncserver@%i.service
 
 [Service]
 Type=simple
-ExecStart=/bin/bash -l -c 'vncserver -fg %I'
 Restart=always
+
+ExecStart=/bin/bash -l -c 'vncserver -fg %I'
 ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I
 
 [Install]
diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target
new file mode 100644
index 0000000..ac91fa1
--- /dev/null
+++ b/.config/systemd/user/wm@.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=Window Manager on display %I
+Requires=wmii@%i.service
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
index 3902627..0442fca 100644
--- a/.config/systemd/user/wmii@.service
+++ b/.config/systemd/user/wmii@.service
@@ -1,10 +1,13 @@
 [Unit]
-Description=Window Manager Improved Improved
+Description=Window Manager Improved Improved on X display %I
 Documentation=file:/usr/share/doc/wmii/wmii.pdf
+Before=wm@%i.target
+StopWhenUnneeded=true
 
 [Service]
-Type=simple
-Restart=no
+# 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'
diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service
index 02165a7..3ee349f 100644
--- a/.config/systemd/user/x0vncserver@.service
+++ b/.config/systemd/user/x0vncserver@.service
@@ -1,6 +1,7 @@
 [Unit]
-Description=VNC server for X displays
+Description=VNC server for real X display %I
 Conflicts=vncserver@%i.service
+StopWhenUnneeded=true
 
 [Service]
 Type=simple
diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service
index c7844d2..85decd2 100644
--- a/.config/systemd/user/xcompmgr@.service
+++ b/.config/systemd/user/xcompmgr@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Composite Window-Effects Manger
+Description=Composite Window-Effects Manger on X display %I
 Documentation=man:xcompmgr(1)
 StopWhenUnneeded=true