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

diff --git a/.bashrc b/.bashrc
index b69df3f..18c00e2 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
 
@@ -176,26 +196,6 @@ trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT
 
 
 if test -x /usr/bin/git >/dev/null 2>&1; then
-    # chdir to a directory
-    cdgitpath() {
-        if [ $# -ne 1 ]; then
-            echo "Usage: cdgitpath path_key" >&2
-            return 1
-        fi
-
-        path_key="$1"
-        if [ -z "$path_key" ]; then
-            echo "Usage: cdgitpath path_key" >&2
-            return 1
-        fi
-
-        path_url="`git config --get --path $path_key`"
-        if echo "$path_url" | grep -q '^file:/'; then
-            path_url="`echo \"$path_url\" | sed 's@^file:/\+@/@'`"
-        fi
-        cd "$path_url"
-    }
-
     # chdir to a remote's directory (if the remote is on the local FS)
     cdremote() {
         if [ $# -gt 1 ]; then
@@ -235,6 +235,24 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
         fi
     }
 
+    # completion for `cd_worktree`
+
+    _cd_worktree_comp() {
+        local cur="${COMP_WORDS[COMP_CWORD]}"
+        COMPREPLY=(`compgen -W "$(
+            git worktree list | awk '{s=$3; gsub("[\\\\[\\\\]]", "", s); print s}'
+        )" -- "$cur"`)
+    }
+
+    _cd_worktree_comp_loader() {
+        _completion_loader git
+        unset _cd_worktree_comp_loader
+        complete -F _cd_worktree_comp cd_worktree
+        return 124
+    }
+
+    complete -F _cd_worktree_comp_loader cd_worktree
+
     # completion for aliases in global .gitconfig
 
     # fixup rbi rbia rbiap rbip - do refs name completion
@@ -320,3 +338,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