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

diff --git a/x/.xinitrc b/x/.xinitrc
index 7966201..4a91997 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,18 +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 &
 
-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