diff options
| author | Jesse Luehrs <doy@tozt.net> | 2024-02-22 23:50:29 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2024-02-22 23:50:29 -0500 |
| commit | 82afe435a24f4ea88182f3051e6837d5d6c0d68a (patch) | |
| tree | 413ecb4678dc25e29cef6618de4052d73ebf8334 /bash | |
| parent | 44ce00838e967a1f95b4e55cd4b57fa7aa3f4456 (diff) | |
| download | conf-82afe435a24f4ea88182f3051e6837d5d6c0d68a.tar.gz conf-82afe435a24f4ea88182f3051e6837d5d6c0d68a.zip | |
clean up my shell config a bit
Diffstat (limited to 'bash')
| -rw-r--r-- | bash/.bash_profile | 2 | ||||
| -rw-r--r-- | bash/.bashrc | 25 |
2 files changed, 9 insertions, 18 deletions
diff --git a/bash/.bash_profile b/bash/.bash_profile index b200eb1..e8c96d8 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,4 +1,4 @@ -# shellcheck source=bashrc +# shellcheck source=bash/.bashrc . "$HOME"/.bashrc # vim:ft=sh: diff --git a/bash/.bashrc b/bash/.bashrc index 9341497..74ac5cf 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,15 +1,10 @@ # language environments {{{ -# shellcheck disable=1090 -test -f "$HOME"/perl5/perlbrew/etc/bashrc && source "$HOME"/perl5/perlbrew/etc/bashrc -test -f "$HOME"/python/bin/activate && source "$HOME"/python/bin/activate -type rbenv > /dev/null 2>&1 && eval "$(rbenv init -)" -test -d "$HOME"/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH" +test -d "$HOME/.cargo/bin" && export PATH="$HOME/.cargo/bin:$PATH" # }}} # environment {{{ -[ -d /usr/share/git/diff-highlight ] && export PATH="/usr/share/git/diff-highlight:${PATH}" -[ -d /usr/local/share/git-core/contrib/diff-highlight ] && export PATH="/usr/local/share/git-core/contrib/diff-highlight:${PATH}" -PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:$PATH" +PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:$PATH" export PATH +# shellcheck source=sh/.config/sh/env [ -f "$HOME/.config/sh/env" ] && source "$HOME"/.config/sh/env # }}} # Test for an interactive shell. {{{ @@ -19,16 +14,11 @@ if [[ $- != *i* ]] ; then # Shell is non-interactive. Be done now! return fi -[ -z "$PS1" ] && return # }}} -# Change the window title of X terminals {{{ -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome|screen*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - ;; -esac # }}} +[ -z "$PS1" ] && return +# }}} # aliases {{{ +# shellcheck source=sh/.config/sh/aliases [ -f "$HOME/.config/sh/aliases" ] && source "$HOME"/.config/sh/aliases -[ -f "$HOME/.config/sh/functions" ] && source "$HOME"/.config/sh/functions # }}} # completion {{{ #shellcheck disable=SC1091 @@ -56,8 +46,9 @@ else export PROMPT_COMMAND="${PROMPT_COMMAND};history -a" fi # plugins {{{ -source ~/.config/sh/cdhist.sh +# shellcheck source=sh/.config/sh/fzf/shell/completion.bash source ~/.config/sh/fzf/shell/completion.bash +# shellcheck source=sh/.config/sh/fzf/shell/key-bindings.bash source ~/.config/sh/fzf/shell/key-bindings.bash # }}} # prompt {{{ |