X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=ef3423fc6ac7a262add2802dc18179e36ea9fbc8;hb=2c9e8b23a92508c4fe13c9b43eae6274786f5aa9;hp=b69df3fd59b0e25ba0660dac46b175f9ee1fc78c;hpb=58bac4e53ad1aab305de77f24a5e4a3d130e2ad4;p=dotfiles.git

diff --git a/.bashrc b/.bashrc
index b69df3f..ef3423f 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 python3.11
+delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3.11 python3.12
 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,17 +163,25 @@ 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 pip3.11
+        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 pip3.12
         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 pip3.11
+    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 pip3.12
+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
 
-#if which pyenv >/dev/null 2>&1; then
-#   eval "`pyenv init -`"
-#   eval "`pyenv virtualenv-init -`"
-#fi
 
 . virtualenvwrapper_lazy.sh 2>/dev/null
 
@@ -320,3 +340,10 @@ if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&
 
     X() { history -a; _non_bash_X; history -r; }
 fi
+
+if test -x /usr/bin/screen >/dev/null 2>&1; then
+    screen_newwin() {
+        history -a
+        screen "$@"
+    }
+fi