+# shellcheck disable=SC1090 # -- Can't follow non-constant source
+
###########################
# Settings for all shells #
###########################
# Set EMAIL from the freedesktop environment.d
if [ -r ~/.config/environment.d/10-email.conf ]; then
- # shellcheck disable=SC1090
source ~/.config/environment.d/10-email.conf
export EMAIL
fi
-# Pick up SSH agent socket in case it isn't set automatically
+# Pick up SSH agent socket
if [ -z "$SSH_AUTH_SOCK" ]; then
- SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
- export SSH_AUTH_SOCK
+ if [ -r ~/.ssh-agent.env ]; then
+ source ~/.ssh-agent.env
+ else
+ SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
+ export SSH_AUTH_SOCK
+ fi
fi