# Editor settings
if emacsclient --version &> /dev/null; then
export ALTERNATE_EDITOR="vim"
- export EDITOR="emacsclient --create-frame"
- export EDITORBG="emacsclient --create-frame --no-wait"
+ export EDITOR="emacsclient --tty"
- # Disable emacs inside screen
if [[ "$TERM" == screen* ]]; then
- export EMACS_SERVER_FILE=
+ export EDITORBG="$EDITOR"
+ else
+ export EDITORBG="emacsclient --create-frame --no-wait"
fi
else
export EDITOR="vim"
export EDITORBG="vim"
fi
-# Expand any symbolic links in the TMPDIR environment variable
-[ -n "$TMPDIR" ] && export TMPDIR="$(cd "${TMPDIR}" && pwd -P)"
-
-# Load the bash functions
source "${HOME}/.bash/functions"
-# The current directory shouldn't be in the path
-pathremove .
+pathprepend "${HOME}/bin"
+
+# Pick up SSH agent socket in case it isn't set automatically
+if [ -z "$SSH_AUTH_SOCK" ]; then
+ export SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
+fi
# Load local environment settings
[ -r "${HOME}/.bash/environment_local" ] && source "${HOME}/.bash/environment_local"
-# ~/bin should be in the front of path if it exists
-pathprepend "${HOME}/bin"
-