X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=4a919979bbc6860b1b3ed7ba9cc91a390260faef;hb=e3da9572f033be86e6103a4224f45b0dbec5694a;hp=34049dad55583b81f67fcd36b0b3233b91f05d6c;hpb=a512afc0dc1ab7513a2788a3c42de1e25d320ac7;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
index 34049da..4a91997 100755
--- 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