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

diff --git a/x/.xinitrc b/x/.xinitrc
index 685a75a..4a91997 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,28 +5,21 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 # notifications
 dunst &
 
-# tray icons
-# trayer --align right --widthtype request --SetPartialStrut false --height 22 &
+# auto locking but only on laptop
+if [ $(hostname) != ygdrassil ]; then
+	xautolock -locker slock -time 10 &
+fi
+
+# status bar
+slstatus &
 
-# gpg agent
-eval "$(gpg-agent --daemon)"
+# compositor
+xcompmgr -a -c -l0 -t0 -r0 -o.00 &
 
-# XResources
-xrdb -merge ~/.Xresources
+setxkbmap dvorak,ru ,phonetic_dvorak compose:ralt,grp:shifts_toggle,grp_led:scroll,ctrl:swapcaps
 
-# auto locking
-xautolock -locker slock -time 10 &
 
 # 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
-	unset f
+if [ -f /etc/X11/xinit/xinitrc ]; then
+	. /etc/X11/xinit/xinitrc
 fi
-
-# status bar
-while true; do xsetroot -name "$(bar)"; sleep 1m; done &
-
-# wm
-while true; do dwm 1>/tmp/dwm.log 2>&1; done