update old modules and use newer versions of slstatus

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644 (file)
new mode 100755 (executable)
index 53c756f..4a91997
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,14 +1,25 @@
-xrdb -merge ~/.Xresources
-urxvtd -q -o -f
-
-envfile="$HOME/.gnupg/gpg-agent.env"
-if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null
-then
-       eval "$(cat "$envfile")"
-else
-       eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
+#!/bin/bash
+#To fix java applications in tiling (e.g. arduino)
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# notifications
+dunst &
+
+# auto locking but only on laptop
+if [ $(hostname) != ygdrassil ]; then
+       xautolock -locker slock -time 10 &
 fi
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
 
-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