locker not on desktop, svn cleanup

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
index 685a75a..2d7271d 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,24 +5,22 @@ 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 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
+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