added vimperator, updated folder filter for email, updated vdirsyncer url

[dotfiles.git] / .xinitrc

diff --git a/.xinitrc b/.xinitrc
index ba0c6ef..53c756f 100644 (file)
--- a/.xinitrc
+++ b/.xinitrc
@@ -1 +1,14 @@
+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")"
+fi
+export GPG_AGENT_INFO
+export SSH_AUTH_SOCK
+
 exec i3