From c0ace3ce0e4fd5c53572c547252365a724110c03 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 10 Aug 2019 15:09:02 -0400 Subject: [PATCH 1/1] shell: it probably makes more sense to start ssh-agent in ~/.profile --- .bashrc | 9 --------- .config/guix/manifest/jirud.scm | 1 + .profile | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.bashrc b/.bashrc index 9e3f5e2..d8bbe5e 100644 --- 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 --- 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 --- 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 \ -- 2.20.1