Merge remote-tracking branch 'origin/master' into purdue-cs/master

Conflicts:
	.config/X11/clientrc
	.config/bash/rc.d/emacs.sh
	.config/cron/make-config
	.config/emacs/custom.el
	.config/emacs/init.el
	.config/git/config
	.config/login.sh
	.config/selected_editor
	.local/bin/config-path

18 files changed, 113 insertions, 27 deletions

diff --git a/.config/systemd/user/default.target.wants/batterymon.service b/.config/systemd/user/default.target.wants/batterymon.service
deleted file mode 100644
index c8abc0d..0000000
--- a/.config/systemd/user/default.target.wants/batterymon.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Battery monitor
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/batterymon 20 "amixer sset Master unmute 100%; espeak 'PLUG ME IN'; sleep 7;"
-
-[Install]
-WantedBy=default.target
diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service
index ef8f65f..e3a3cc0 100644..120000
--- a/.config/systemd/user/default.target.wants/emacs-daemon.service
+++ b/.config/systemd/user/default.target.wants/emacs-daemon.service
@@ -1,9 +1 @@
-[Unit]
-Description=Emacs deamon
-
-[Service]
-Type=forking
-ExecStart=/bin/bash -l -c 'emacs --daemon'
-
-[Install]
-WantedBy=default.target
+../emacs-daemon.service
\ No newline at end of file
diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service
deleted file mode 100644
index 93c12b0..0000000
--- a/.config/systemd/user/default.target.wants/gpg-agent.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description="GnuPG agent daemon"
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg
-
-[Install]
-WantedBy=default.target
diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service
new file mode 100644
index 0000000..568af3f
--- /dev/null
+++ b/.config/systemd/user/dunst@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dunst notification-daemon on X display %I
+Documentation=man:dunst(1)
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/dunst
+Restart=always
diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service
new file mode 100644
index 0000000..279d83a
--- /dev/null
+++ b/.config/systemd/user/emacs-daemon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Emacs deamon
+
+[Service]
+Type=forking
+ExecStart=/bin/bash -l -c 'emacs --daemon'
+ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"'
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service
new file mode 100644
index 0000000..71e2114
--- /dev/null
+++ b/.config/systemd/user/lxpanel@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LXDE Desktop Panel on X display %I
+Documentation=man:lxpanel(1)
+StopWhenUnneeded=true
+After=wm@%i.target
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/lxpanel
+Restart=always
diff --git a/.config/systemd/user/maildirproc@.service b/.config/systemd/user/maildirproc@.service
new file mode 100644
index 0000000..bdca746
--- /dev/null
+++ b/.config/systemd/user/maildirproc@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=maildirproc mail filter
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/maildirproc -r ${HOME}/.config/maildirproc/%I.rc
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
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
new file mode 100644
index 0000000..b4ef3bb
--- /dev/null
+++ b/.config/systemd/user/redshift@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Redshift display colour temperature adjustment on X display %I
+Documentation=http://jonls.dk/redshift/
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/redshift
+ExecStopPost=/usr/bin/redshift -x
+Restart=always
diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service
new file mode 100644
index 0000000..2433977
--- /dev/null
+++ b/.config/systemd/user/vncserver@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=VNC virtual desktop %I
+Conflicts=x0vncserver@%i.service
+
+[Service]
+Type=simple
+Restart=always
+
+ExecStart=/bin/bash -l -c 'vncserver -fg %I'
+ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I
+
+[Install]
+WantedBy=default.target
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
new file mode 100644
index 0000000..0442fca
--- /dev/null
+++ b/.config/systemd/user/wmii@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Window Manager Improved Improved on X display %I
+Documentation=file:/usr/share/doc/wmii/wmii.pdf
+Before=wm@%i.target
+StopWhenUnneeded=true
+
+[Service]
+# 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
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@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/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/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service
new file mode 100644
index 0000000..3ee349f
--- /dev/null
+++ b/.config/systemd/user/x0vncserver@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=VNC server for real X display %I
+Conflicts=vncserver@%i.service
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/x0vncserver display=%I PasswordFile=%h/.vnc/passwd
+Restart=always
diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service
new file mode 100644
index 0000000..85decd2
--- /dev/null
+++ b/.config/systemd/user/xcompmgr@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Composite Window-Effects Manger on X display %I
+Documentation=man:xcompmgr(1)
+StopWhenUnneeded=true
+
+[Service]
+Type=simple
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/xcompmgr
+Restart=always