update old modules and use newer versions of slstatus

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
index 3b7197f..4a91997 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,19 +1,25 @@
 #!/bin/bash
 #To fix java applications in tiling (e.g. arduino)
 export _JAVA_AWT_WM_NONREPARENTING=1
-dunst &
-trayer --align right --widthtype request --SetPartialStrut false --height 22 &
-/usr/sbin/wpa_gui -t &
 
-eval "$(gpg-agent --daemon)"
-xrdb -merge ~/.Xresources
+# notifications
+dunst &
 
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-       for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-               [ -x "$f" ] && . "$f"
-       done
-       unset f
+# auto locking but only on laptop
+if [ $(hostname) != ygdrassil ]; then
+       xautolock -locker slock -time 10 &
 fi
 
-while true; do xsetroot -name "$(bar)"; sleep 1m; done &
-while true; do dwm 1>/tmp/dwm.log 2>&1; done
+# status bar
+slstatus &
+
+# compositor
+xcompmgr -a -c -l0 -t0 -r0 -o.00 &
+
+setxkbmap dvorak,ru ,phonetic_dvorak compose:ralt,grp:shifts_toggle,grp_led:scroll,ctrl:swapcaps
+
+
+# Other system wide xinit files
+if [ -f /etc/X11/xinit/xinitrc ]; then
+       . /etc/X11/xinit/xinitrc
+fi