X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=90bcd2f3ed435bf650d13ac424af018d703e871b;hb=75f3a552c1b9dcaeead05882a94e6805375be506;hp=08f1db1b64719ed7443dcd7d054de4b21f580335;hpb=c6bc324f898008d786ac435aa48d6febb3733cba;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644
new mode 100755
index 08f1db1..90bcd2f
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,13 +1,6 @@
-fbgrab /tmp/bg.png
+#!/bin/bash
 
-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
+eval "$(gpg-agent --daemon)"
+xrdb -merge ~/.Xresources
 
 exec i3