update old modules and use newer versions of slstatus

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
index 34049da..4a91997 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,29 +5,21 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 # notifications
 dunst &
 
-# gpg agent
-eval "$(gpg-agent --daemon)"
-
-# XResources
-xrdb -merge ~/.Xresources
-
 # 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
-fi
-
 # status bar
 slstatus &
 
 # compositor
 xcompmgr -a -c -l0 -t0 -r0 -o.00 &
 
-# window manager
-while true; do dwm 1>/tmp/dwm.log 2>&1; done
+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