X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=f910dadbd2040132d165ea2068957180fd33300e;hb=a9f15720d04a1597cf5297ae9da89f47af304e7e;hp=763a2b5b38a20e0c5dea47f680c7eacc5e29a5cf;hpb=98ef8dd720b8a4c6a3a19be3d5b4972188951967;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
index 763a2b5..f910dad 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,17 +1,30 @@
 #!/bin/bash
-PATH=$PATH:~/.local/bin
-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 only 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
 
-while true; do xsetroot -name "$(bar)"; sleep 1m; done &
-while true; do dwm >dwm.log 2>&1; done
+# status bar
+slstatus &
+
+# window manager
+while true; do dwm 1>/tmp/dwm.log 2>&1; done