X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=a9ac99de919a16f7142387c4f53d43d5a76fcb5f;hb=cff73794dc6c92da033b4a0eb87ee9451373663f;hp=2d94622f2a7d7945e0159715fd710b50a2d376f9;hpb=55c8b1e2617b10458a50ff5148c4830338e12728;p=dotfiles.git diff --git a/.bashrc b/.bashrc index 2d94622..a9ac99d 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 @@ -50,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 @@ -159,10 +170,18 @@ if type -p pip >/dev/null 2>&1 || type -p pip3 >/dev/null 2>&1; then 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 -# eval "`pyenv init -`" -# eval "`pyenv virtualenv-init -`" -#fi +if test -d "$HOME"/.pyenv +then + PYENV_ROOT="$HOME"/.pyenv + export PYENV_ROOT + PATH="$PYENV_ROOT/bin:$PATH" + if which pyenv >/dev/null 2>&1; then +# eval "`pyenv init --path`" + eval "`pyenv init -`" + eval "`pyenv virtualenv-init -`" + fi +fi + . virtualenvwrapper_lazy.sh 2>/dev/null