X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=f516a374c36abd98560693fb7bfb4ed4247152fb;hb=30db78e1dbb83ed3025f5378d4a83e5e5441da4e;hp=13c1e996634c767dd32a8590f094b0c4f9b9970b;hpb=d5dde923f4bfb0cb4841d8d2062d889fb06b3faf;p=dotfiles.git diff --git a/.bashrc b/.bashrc index 13c1e99..f516a37 100644 --- a/.bashrc +++ b/.bashrc @@ -10,6 +10,9 @@ umask 077 PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +if [ -n "$DISPLAY" ]; then + PATH=$PATH:/usr/games +fi # Make `ssh host date` to display in 24-hour format LANG=C @@ -26,6 +29,7 @@ esac . "$HOME"/.shellrc if [ "$HISTFILE" = "$HOME/.bash_history" ]; then + history -r # This is the default value set by interactive bash # when the global value was unset. Unset it here too. unset HISTFILE @@ -49,6 +53,14 @@ back() { cd - "$@"; } functions() { typeset -f "$@"; } j() { jobs; } +if [ -r "$HOME"/admin/prog/bash_prompt ]; then + . "$HOME"/admin/prog/bash_prompt + set_prompt + unset set_prompt +else + PS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ " +fi + if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then _BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions @@ -131,7 +143,7 @@ delegate_completion() { delegate_completion make m delegate_completion ping p -delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 +delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3.11 DELEGATE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2 delegate_completion ssh s delegate_completion wget wget-m wget-wrapper ww @@ -151,11 +163,11 @@ fi if type -p pip >/dev/null 2>&1 || type -p pip3 >/dev/null 2>&1; then _pip_completion_loader() { eval "`pip completion --bash`" - complete -F _pip_completion pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 + complete -F _pip_completion pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11 unset _pip_completion_loader return 124 } - complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 + complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11 fi #if which pyenv >/dev/null 2>&1; then