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

diff --git a/x/.xinitrc b/x/.xinitrc
index f2daf31..4a91997 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,16 +1,25 @@
 #!/bin/bash
-urxvtd -q -o -f &
-xautolock -locker ~/.local/bin/lock.sh &
-dunst &
+#To fix java applications in tiling (e.g. arduino)
+export _JAVA_AWT_WM_NONREPARENTING=1
 
-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
 
-exec i3
+# 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