shell: it probably makes more sense to start ssh-agent in ~/.profile

diff --git a/.bashrc b/.bashrc
index 9e3f5e2..d8bbe5e 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -102,12 +102,3 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-
-if [ -z "$IS_GUIX_SYSTEM" ]; then
-    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-        ssh-agent > ~/.ssh-agent-thing
-    fi
-    if [[ ! "$SSH_AUTH_SOCK" ]]; then
-        eval "$(<~/.ssh-agent-thing)"
-    fi
-fi

diff --git a/.config/guix/manifest/jirud.scm b/.config/guix/manifest/jirud.scm
index 9e997f6..c4e7f9e 100644 (file)
--- a/.config/guix/manifest/jirud.scm
+++ b/.config/guix/manifest/jirud.scm
@@ -81,6 +81,7 @@
     "ncdu"
     "notmuch"
     "nss-certs"
+    "openssh"
     ;; "openssl"
     "password-store"
     "pinentry-emacs"

diff --git a/.profile b/.profile
index 4ca1d4b..3b0071f 100644 (file)
--- a/.profile
+++ b/.profile
@@ -52,6 +52,16 @@ if [ -z "$IS_GUIX_SYSTEM" ]; then
     fi
 fi
 
+# start an ssh-agent (with guix's openssh)
+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+        ssh-agent > ~/.ssh-agent-thing
+    fi
+    if [[ ! "$SSH_AUTH_SOCK" ]]; then
+        eval "$(<~/.ssh-agent-thing)"
+    fi
+fi
+
 setxkbmap \
     -layout us,ir \
     -option ctrl:nocaps \