X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=x%2F.xinitrc;h=2d7271dd3a992c5c68afff5493d651f9ff214d21;hb=8a098d0edf56fcbcd680ce68329afb1f707f2243;hp=f2daf3130a4e654d583a0a5d58692994064c1cec;hpb=006f2b070968a203c44232591024870d88e80411;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
index f2daf31..2d7271d 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,16 +1,30 @@
 #!/bin/bash
-urxvtd -q -o -f &
-xautolock -locker ~/.local/bin/lock.sh &
+#To fix java applications in tiling (e.g. arduino)
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# notifications
 dunst &
 
+# gpg agent
 eval "$(gpg-agent --daemon)"
+
+# XResources
 xrdb -merge ~/.Xresources
 
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-	for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+# auto locking but not on laptop
+if [ $(hostname) != "ygdrassil" ]; then
+	xautolock -locker slock -time 10 &
+fi
+
+# Other system wide xinit files
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
 		[ -x "$f" ] && . "$f"
 	done
-	unset f
 fi
 
-exec i3
+# status bar
+while true; do xsetroot -name "$(bar)"; sleep 1m; done &
+
+# wm
+while true; do dwm 1>/tmp/dwm.log 2>&1; done