Launch gpg-agent with X

diff --git a/X/.xinitrc b/X/.xinitrc
index 11f0213ffbadc54a7bf65af647771511585861a9..a0cce71ef23a37d84ed69493e5fd7b3cff7f540d 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -54,4 +54,12 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
+if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
+    eval $(gpg-agent --daemon \
+                    --use-standard-socket \
+                    --write-env-file "${HOME}/.gpg-agent-info")
+fi
+
+gpg-connect-agent udatestartuptty /bye >/dev/null
+
 exec /usr/bin/ratpoison

diff --git a/bash/.bashrc b/bash/.bashrc
index c58049c1966f8934c922f0f2ebd81633efe1a8df..3bf2436ee46d77555c31ebec35e180fc0e19c76c 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,14 +123,6 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
+
 GPG_TTY=$(tty)
 export GPG_TTY
-
-if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-    eval $(gpg-agent --daemon \
-                    --use-standard-socket \
-                    --write-env-file "${HOME}/.gpg-agent-info")
-fi
-
-gpg-connect-agent udatestartuptty /bye >/dev/null
-