diff options
| author | Amin Bandali <bandali@gnu.org> | 2019-08-10 15:09:02 -0400 |
|---|---|---|
| committer | Amin Bandali <bandali@gnu.org> | 2019-08-10 15:09:02 -0400 |
| commit | c0ace3ce0e4fd5c53572c547252365a724110c03 (patch) | |
| tree | 87f721ea491e71b44399a466905036b1ace717c2 | |
| parent | 3dfefa5182d995659829548f2fe39eb584b6688e (diff) | |
| download | configs-c0ace3ce0e4fd5c53572c547252365a724110c03.tar.gz configs-c0ace3ce0e4fd5c53572c547252365a724110c03.tar.xz configs-c0ace3ce0e4fd5c53572c547252365a724110c03.zip | |
shell: it probably makes more sense to start ssh-agent in ~/.profile
| -rw-r--r-- | .bashrc | 9 | ||||
| -rw-r--r-- | .config/guix/manifest/jirud.scm | 1 | ||||
| -rw-r--r-- | .profile | 10 |
3 files changed, 11 insertions, 9 deletions
@@ -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" @@ -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 \ |