summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/X11/clientrc17
-rw-r--r--.config/systemd/user/dunst@.service10
-rw-r--r--.config/systemd/user/lxpanel@.service10
-rw-r--r--.config/systemd/user/rbar@.service7
-rw-r--r--.config/systemd/user/redshift@.service6
-rw-r--r--.config/systemd/user/wmii@.service12
l---------.config/systemd/user/wmii@.service.wants/lxpanel@.service1
l---------.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service1
l---------.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service1
l---------.config/systemd/user/wmii@.service.wants/rbar@99_clock.service1
l---------.config/systemd/user/wmii@.service.wants/redshift@.service1
l---------.config/systemd/user/wmii@.service.wants/xcompmgr@.service1
-rw-r--r--.config/systemd/user/xcompmgr@.service10
-rwxr-xr-x.config/wmii-hg/autostart16
-rw-r--r--.config/wmii-hg/config.sh3
-rwxr-xr-x.config/wmii-hg/rbar9
16 files changed, 75 insertions, 31 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index 26455d3..d18d714 100644
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -1,9 +1,7 @@
#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
+# Load system xinit modules (disabled)
+# Remove "false &&" to enable
if false && [ -d /etc/X11/xinit/xinitrc.d ]; then
echo ' ==> Running scripts in Entering xinitrc.d/*'
for f in /etc/X11/xinit/xinitrc.d/*; do
@@ -19,8 +17,9 @@ if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap"
fi
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
-exec wmii
+#exec wmii
+wm=wmii
+systemctl --user start "${wm}@${DISPLAY}.service"
+mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
+cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" >/dev/null
+rm "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service
new file mode 100644
index 0000000..2aff6be
--- /dev/null
+++ b/.config/systemd/user/dunst@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dunst notification-daemon
+Documentation=man:dunst(1)
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/dunst
+Restart=always
diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service
new file mode 100644
index 0000000..3327ab4
--- /dev/null
+++ b/.config/systemd/user/lxpanel@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LXDE Desktop Panel
+Documentation=man:lxpanel(1)
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/lxpanel
+Restart=always
diff --git a/.config/systemd/user/rbar@.service b/.config/systemd/user/rbar@.service
new file mode 100644
index 0000000..18d6201
--- /dev/null
+++ b/.config/systemd/user/rbar@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=WMII rbar %I
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/bash -c '%h/.wmii-hg/rbar %I'
diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service
index 41a0b7a..149bb74 100644
--- a/.config/systemd/user/redshift@.service
+++ b/.config/systemd/user/redshift@.service
@@ -1,11 +1,11 @@
[Unit]
Description=Redshift display colour temperature adjustment
Documentation=http://jonls.dk/redshift/
+StopWhenUnneeded=true
[Service]
+Type=simple
Environment=DISPLAY=%I
ExecStart=/usr/bin/redshift
+ExecStopPost=/usr/bin/redshift -x
Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
new file mode 100644
index 0000000..10fc4e9
--- /dev/null
+++ b/.config/systemd/user/wmii@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Window Manager Improved Improved
+Documentation=file:/usr/share/doc/wmii/wmii.pdf
+
+[Service]
+Type=simple
+Restart=no
+
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/bash -l -c /usr/bin/wmii
+ExecStop=/usr/bin/wmiir xwrite /ctl Quit
+ExecStopPost=/usr/bin/bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I"
diff --git a/.config/systemd/user/wmii@.service.wants/lxpanel@.service b/.config/systemd/user/wmii@.service.wants/lxpanel@.service
new file mode 120000
index 0000000..06ed03f
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/lxpanel@.service
@@ -0,0 +1 @@
+../lxpanel@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service b/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service
new file mode 120000
index 0000000..286989e
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service
@@ -0,0 +1 @@
+../rbar@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service
new file mode 120000
index 0000000..286989e
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service
@@ -0,0 +1 @@
+../rbar@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service b/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service
new file mode 120000
index 0000000..286989e
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service
@@ -0,0 +1 @@
+../rbar@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/redshift@.service b/.config/systemd/user/wmii@.service.wants/redshift@.service
new file mode 120000
index 0000000..59234a7
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/redshift@.service
@@ -0,0 +1 @@
+../redshift@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/xcompmgr@.service b/.config/systemd/user/wmii@.service.wants/xcompmgr@.service
new file mode 120000
index 0000000..be8518c
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/xcompmgr@.service
@@ -0,0 +1 @@
+../xcompmgr@.service \ No newline at end of file
diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service
new file mode 100644
index 0000000..c7844d2
--- /dev/null
+++ b/.config/systemd/user/xcompmgr@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Composite Window-Effects Manger
+Documentation=man:xcompmgr(1)
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/xcompmgr
+Restart=always
diff --git a/.config/wmii-hg/autostart b/.config/wmii-hg/autostart
deleted file mode 100755
index 156fe7d..0000000
--- a/.config/wmii-hg/autostart
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-. include.sh
-
-xrandr --output VGA-1 --off
-
-daemon xcompmgr &> /dev/null
-daemon lxpanel &> /dev/null
-#daemon nm-applet &> /dev/null
-daemon dunst &> /dev/null
-daemon blueman-applet &> /dev/null
-daemon clipit -dn &> /dev/null
-
-PATH="$WMII_CONFPATH:$PATH"
-daemon rbar_acpi 97_acpi &> /dev/null
-daemon rbar_wifi 98_wifi &> /dev/null
-daemon rbar_clock 99_clock &> /dev/null
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh
index 888c3ae..98c41a6 100644
--- a/.config/wmii-hg/config.sh
+++ b/.config/wmii-hg/config.sh
@@ -49,9 +49,6 @@ Event() {
Event FocusTag "$tag"
fi
done < <(lstags)
-
- # Run the autostart action
- Action autostart
;;
WmiircQuit) ## No args
echo ' ==> Stopping wmiirc'
diff --git a/.config/wmii-hg/rbar b/.config/wmii-hg/rbar
new file mode 100755
index 0000000..9aaa485
--- /dev/null
+++ b/.config/wmii-hg/rbar
@@ -0,0 +1,9 @@
+#!/bin/bash
+IFS=:
+read -r name prefix DISPLAY <<<"$1"
+export DISPLAY
+
+id=$1
+name=${id#[0-9][0-9]_}
+
+exec "$0"_"$name" "${id}"