# Add ~/bin and subdirs to PATH if needed
while read -r p; do
echo "$PATH" | tr ':' '\n' | grep -qxF "$p" || PATH="${p}:$PATH"
-done < <(find -L ~/bin -maxdepth 1 -type d 2> /dev/null)
+done < <(find -L ~/bin -depth -maxdepth 1 -type d 2> /dev/null)
# Set environment variables, eg EMAIL, LANG
eval "$(cat 2> /dev/null /etc/default/locale /etc/locale.conf ~/.config/environment.d/*.conf | awk -F= '/^[^# ]/ {print $0 ";export " $1}')"
fi
fi
+# Look for DBUS
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -S "/run/user/$(id -u)/bus" ]; then
+ DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
+ export DBUS_SESSION_BUS_ADDRESS
+fi
+
###########################
# Interactive shells only #
# This prevents long/ugly command lines from showing up in xterm titles
function aliasf {
- eval "function $1 { $2 \$@; }"
+ eval "function $1 { $2 \"\$@\"; }"
}
aliasf python 'PYTHONSTARTUP=~/.pythonrc.py python3'
aliasf webshare 'python3 -mhttp.server'
+export EDITOR='vim'
+aliasf edit "$EDITOR"
+
if ! command -v pbcopy &> /dev/null; then
alias pbcopy='xsel --clipboard --input'
alias pbcopym='xsel --input'
}
-##################
-# Editor aliases #
-##################
-
-if emacsclient --version &> /dev/null; then
- export ALTERNATE_EDITOR='vim'
- export EDITOR='emacsclient --tty'
-
- if [[ "$TERM" == screen* ]]; then
- aliasf edit 'emacsclient --tty'
- else
- aliasf edit 'emacsclient --create-frame --no-wait'
- fi
-else
- export EDITOR='vim'
- aliasf edit 'vim'
-fi
-
-
#########################
# Optional local config #
#########################
function print_title_prompt {
printf '\e]0;bash:%s (%s)\a' \
"${PWD/$HOME/\~}" \
- "$(hostname -s)"
+ "$(cat /etc/hostname)"
if [[ "$TERM" == screen* ]]; then
printf '\ekbash\e\\'
printf '\e]0;%s (%s)\a' \
"$(tr -cd '[:graph:] ' <<< "$BASH_COMMAND")" \
- "$(hostname -s)"
+ "$(cat /etc/hostname)"
if [[ "$TERM" == screen* ]]; then
printf '\ek%s\e\\' \