X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=x%2F.xinitrc;h=4a919979bbc6860b1b3ed7ba9cc91a390260faef;hb=e3da9572f033be86e6103a4224f45b0dbec5694a;hp=0132dab311bc817a24f71dd1e35f75d708165881;hpb=925db2b9797e720f138db17c292389d245f2b596;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
index 0132dab..4a91997 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,26 +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
-while true; do xsetroot -name "$(bar)"; sleep 1m; done &
+slstatus &
 
-# wm
-while true; do dwm 1>/tmp/dwm.log 2>&1; done
+# 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