diff options
| -rw-r--r-- | profile.dot.link | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/profile.dot.link b/profile.dot.link index 4c5c866..713b1be 100644 --- a/profile.dot.link +++ b/profile.dot.link @@ -339,9 +339,21 @@ mkdir -p $LOG # Dir colors eval "`dircolors -b ~/.dircolorsrc`" -# SSH and GPG Agents -if [ -x "$HOME/apps/utils-ssh/ssh-agent-loadkeys" ]; then - . $HOME/apps/utils-ssh/ssh-agent-loadkeys +# SSH Agent +# +# Note that there might be other, possibly conflicting startup procedures +# handling SSH agent: +# +# * /usr/lib/systemd/user/ssh-agent.service +# * /usr/lib/systemd/user/gnome-keyring-daemon.service +# * /etc/xdg/autostart/gnome-keyring-* +# * ~/.config/autostart +# +#if [ -e "$HOME/apps/utils-ssh/ssh-agent-eval" ]; then +# $HOME/apps/utils-ssh/ssh-agent-eval +#fi +if [ -x "$HOME/apps/utils-ssh/ssh-agent-keychain" ]; then + . $HOME/apps/utils-ssh/ssh-agent-keychain fi # Set the proper GnuPG TTY when running on console @@ -351,11 +363,14 @@ if [ -z "$DISPLAY" ]; then export GPG_TTY=$(tty) fi -#if [ -e "$HOME/apps/utils-ssh/ssh-agent-eval" ]; then -# $HOME/apps/utils-ssh/ssh-agent-eval -#fi - # GPG Agent +# +# This seems to be already handled by one of these startup procedures: +# +# * /usr/lib/systemd/user/gpg-agent.service +# * /usr/lib/systemd/user/gnome-keyring-daemon.service +# * /etc/xdg/autostart/gnome-keyring-* +# #if [ -e "$HOME/apps/utils-gpg/gpg-agent-eval" ]; then # $HOME/apps/utils-gpg/gpg-agent-eval #fi |