X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=f910dadbd2040132d165ea2068957180fd33300e;hb=60f5130b20ca978213125be77de189edee9bf229;hp=685a75a0f58de8ca2e55b413d71080b8767e2c2c;hpb=7553d3a3fcf877457ea1c93d2d7ab1e3ba11487a;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
index 685a75a..f910dad 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,28 +5,26 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 # notifications
 dunst &
 
-# tray icons
-# trayer --align right --widthtype request --SetPartialStrut false --height 22 &
-
 # gpg agent
 eval "$(gpg-agent --daemon)"
 
 # XResources
 xrdb -merge ~/.Xresources
 
-# auto locking
-xautolock -locker slock -time 10 &
+# 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
+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
 
 # status bar
-while true; do xsetroot -name "$(bar)"; sleep 1m; done &
+slstatus &
 
-# wm
+# window manager
 while true; do dwm 1>/tmp/dwm.log 2>&1; done