Make git-prompt also work in a bash promtp

The `add=local` subcommand creates `.local/bin` if it doesn't exit and
then updates the autoenv to add it to `PATH`.

autoenv/_autoenv

@@ -17,6 +17,7 @@ _autoenv() {
         edit:'edit .enter and .exit scripts in current directory'
         deinit:'remove .enter and .exit scripts in current directory'
         reload:'reload the current environment'
+        add=local:'add .local/bin to PATH'
         add=py:'add Python virtualenv to the autoenv'
       )
       _describe -t commands command commands && ret=0 ;;

autoenv/autoenv.zsh

@@ -22,6 +22,7 @@ commands:
         edit        edit .enter and .exit scripts in current directory
         deinit      remove .enter and .exit scripts in current directory
         reload      reload the current environment
+        add=local   add .local/bin to PATH
         add=py      add Python virtualenv to the autoenv"
       ;;
 
@@ -49,7 +50,7 @@ commands:
       if which vim &> /dev/null; then
         # Exit the autoenv before editing.
         _autoenv_exit $PWD
-        if vim -p $PWD/.enter $PWD/.exit; then
+        if $EDITOR -p $PWD/.enter $PWD/.exit; then
           # If enter script exists, authorize it.
           [ -f $PWD/.enter ] && _autoenv_authorized $PWD/.enter yes
           # If exit script exists, authorize it.
@@ -92,13 +93,34 @@ commands:
       _autoenv_enter $PWD
       ;;
 
+    add=local)  # Add .local/bin to PATH
+      if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
+        echo '.enter or .exit not found'; return 1
+      fi
+      _autoenv_exit $PWD
+      # Create .local/bin if not present
+      if ! [ -d $PWD/.local/bin ]; then
+        mkdir -p $PWD/.local/bin
+      fi
+      # On enter: store PATH and insert .local/bin
+      echo 'OLDPATH=$PATH' >> .enter
+      echo 'PATH=$PWD/.local/bin:$PATH' >> .enter
+      # On exit: reset PATH
+      echo 'PATH=$OLDPATH' >> .exit
+      echo 'unset OLDPATH' >> .exit
+      # Authorize modified autoenv
+      _autoenv_authorized $PWD/.enter yes
+      _autoenv_authorized $PWD/.exit yes
+      _autoenv_enter $PWD
+      ;;
+
     add=py)  # Add Python virtualenv to the sandbox
       if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
         echo '.enter or .exit not found'; return 1
       fi
       _autoenv_exit $PWD
-      virtualenv .local
-      echo 'source .local/bin/activate' >> .enter
+      virtualenv -p `command -v python` .local
+      echo 'source ${0:a:h}/.local/bin/activate' >> .enter
       echo 'deactivate' >> .exit
       _autoenv_authorized $PWD/.enter yes
       _autoenv_authorized $PWD/.exit yes

build/_build-dir

@@ -1,6 +1,7 @@
 #compdef build-dir
 
 _arguments \
-  '(-h --help)'{-h,--help}'[]' \
+  '(-h --help)'{-h,--help}'[show this help message and exit]' \
+  '(-s --show)'{-s,--show}'[show the current build directory]' \
   '--build[invoke a build after selection]' \
   '1:directory:_files'

build/build.plugin.zsh

@@ -32,8 +32,8 @@ fi
 # Interactively choose a `~build` directory for `build` to build.
 build-dir() {
   local usage='usage: build-dir [-h] [--build] [<directory>]'
-  local -a help do_build
-  zparseopts -D h=help -help=help -build=do_build
+  local -a help show do_build
+  zparseopts -D h=help -help=help s=show -show=show -build=do_build
   if [[ -n $help ]]; then
     cat << EOF
 $usage
@@ -45,12 +45,22 @@ positional arguments:
 
 optional arguments:
   -h, --help  show this help message and exit
+  -s, --show  show the current build directory
   --build     invoke a build after selection
 EOF
     return
   fi
   error() { echo "\e[31merror:\e[0m $1" }
   warning() { echo "\e[33mwarning:\e[0m $1" }
+  if [[ -n $show ]]; then
+    if [[ ! -n $build_dir ]]; then
+      error "build directory not set"
+      return 1
+    else
+      echo "$build_dir"
+      return
+    fi
+  fi
   local local_build_dir
   if [[ ${#*} -gt 1 ]]; then
     echo $usage

git-prompt.c

@@ -21,6 +21,11 @@
   }
 #endif
 
+#define color8(CODE) "\e[3" #CODE "m"
+#define color256(CODE) "\e[38;5;" #CODE "m"
+#define bold "\e[1m"
+#define reset "\e[0m"
+
 typedef struct process {
   pid_t pid;
   FILE* out;
@@ -104,7 +109,7 @@ int main() {
   }
   char* branch = trim(branch_buf);
   char prompt[1024] = {};
-  append(prompt, 3, " %{%F{66}%}", branch, "%{%f%}");
+  append(prompt, 3, " " color256(66), branch, reset);
 
   // get the upstream remote if one exists
   char command[1024] = {};
@@ -178,22 +183,22 @@ int main() {
   if (indexed || modified || deleted || unmerged || untracked) {  // modified
     char int_buf[32];
     if (indexed) {
-      append(prompt, 3, "%{%F{2}%}*", inttostr(int_buf, indexed), "%{%f%}");
+      append(prompt, 3, color8(2) "*", inttostr(int_buf, indexed), reset);
     }
     if (modified) {
-      append(prompt, 3, "%{%F{1}%}+", inttostr(int_buf, modified), "%{%f%}");
+      append(prompt, 3, color8(1) "+", inttostr(int_buf, modified), reset);
     }
     if (deleted) {
-      append(prompt, 3, "%{%F{1}%}-", inttostr(int_buf, deleted), "%{%f%}");
+      append(prompt, 3, color8(1) "-", inttostr(int_buf, deleted), reset);
     }
     if (unmerged) {
-      append(prompt, 3, "%{%B%F{1}%}×", inttostr(int_buf, unmerged), "%{%f%b%}");
+      append(prompt, 3, bold color8(1) "×", inttostr(int_buf, unmerged), reset);
     }
     if (untracked) {
-      append(prompt, 1, "%{%F{1}%}…%{%f%}");
+      append(prompt, 1, color8(1) "…" reset);
     }
   } else {  // clean
-    append(prompt, 1, "%{%B%F{2}%}✓%{%f%b%}");
+    append(prompt, 1, bold color8(2) "✓" reset);
   }
 
   // print the prompt

prompt_fresh_setup

@@ -44,7 +44,7 @@ prompt_fresh_setup() {
   fi
 
   local userhost=$USER
-  if [ "$SSH_CONNECTION" != "" ]; then
+  if [ "$SSH_CONNECTION" != "" ] || [ "$DISTROBOX_ENTER_PATH" != "" ]; then
     local user="$user@%{%F{244}%}%M%{%f%}"
     local userhost="$userhost@`hostname`"
   fi
@@ -66,7 +66,7 @@ fresh_line_one() {
   # Construct the time and directory portions of the prompt
   local time_stamp="%{%F{244}%}%D{%H:%M:%S}%{%f%}"
   [[ -n $SANDBOX_HOME ]] && \
-    local directory="%{%F{3}%}$SANDBOX_NAME${PWD#$SANDBOX_HOME}%{%f%}" || \
+    local directory="%{%F{220}%}$SANDBOX_NAME${PWD#$SANDBOX_HOME}%{%f%}" || \
     local directory="%{%F{37}%}%~%{%f%}"
 
   # Check we are in a git repository
@@ -132,16 +132,14 @@ fresh_line_one() {
 
 # Executed before each prompt.
 fresh_almostontop_precmd() {
-  # TODO: store the cursor position for use in fresh_almostontop_preexec
   # CSI ESC[6n gets the cursor position in the form ESC[<row>;<column>R
   printf "\033[6n"
   # Discard prefix delimited by [
   read -s -d [
-  # Store the <row> delimited by ; in fresh_precmd_row
-  read -s -d \; fresh_precmd_row
+  # Store the <row> delimited by ; in row_before
+  read -s -d \; row_before
   # Discard suffix delimted by R otherwise it is output to the tty
   read -s -d R
-  # printf "$fresh_precmd_row\n"
 }
 
 # Executed just after a command has been read and is about to be executed.
@@ -159,7 +157,7 @@ fresh_almostontop_preexec() {
   let "down = $LINES - $row"
   printf "\033[${down}B"
   # Calculate the number of lines in the prompt
-  let "prompt_lines = ($row - $fresh_precmd_row) + 2"
+  let "prompt_lines = ($row - $row_before) + 2"
   # Print new lines to push the old command out of view
   let "new = $row - $prompt_lines"
   for (( i = 0; i < $new; i++ )); do

tasks.yaml

@@ -1,19 +1,27 @@
 ---
 - name: zsh install packages
+  become: '{{package_become}}'
   package:
     name: zsh
     state: present
 
 - name: zsh install Debian packages
   when: ansible_os_family == "Debian"
-  apt:
-    name: '{{item}}'
-    state: present
   become: true
-  with_items:
-    - zsh-doc
+  apt:
+    name:
       - pinentry-curses
+      - silversearcher-ag
       - unzip
+      - zsh-doc
+    state: present
+
+- name: zsh install macOS packages
+  when: ansible_os_family == "Darwin"
+  become: false
+  homebrew:
+    name: the_silver_searcher
+    state: present
 
 - name: zsh clone plugin repos
   git:
@@ -36,6 +44,14 @@
     cmd: ~/.config/zsh/fzf/install --bin
     creates: ~/.config/zsh/fzf/bin/fzf
 
+- name: zsh create directories
+  file:
+    state: directory
+    dest: '{{item}}'
+  with_items:
+    - ~/.local/bin
+    - ~/.local/share/zsh/site-functions
+
 - name: zsh create symbolic links
   file:
     state: link
@@ -72,7 +88,7 @@
       dest: ~/.local/bin/$
 
 - name: zsh get absolute path
-  shell: which zsh
+  shell: command -v zsh
   register: zsh
   changed_when: false
 

update-completion-links.zsh

@@ -11,7 +11,7 @@ for completion in $zsh_completions/src/_*; do
   # Remove existing completion file if it exists.
   [ -f $symlink ] && rm $symlink
   # Check if the command exists on the PATH.
-  if which ${name:1} &> /dev/null; then
+  if command -v ${name:1} &> /dev/null; then
     # Symlink the completion for the existing command.
     [ `uname` = Darwin ] && \
       ln -s $completion $symlink || ln -sr $completion $symlink

utilities/utilities.plugin.zsh

@@ -66,8 +66,11 @@ if which bat &> /dev/null; then
   # Both --theme and --color can be specified multiple times and will override
   # these defaults.
   bat() {
-    command bat --theme='TwoDark' --color always \
-                --paging always --pager 'less -R' "$@"
+    command bat --theme='TwoDark' --color always --paging auto "$@"
+  }
+elif which batcat &> /dev/null; then
+  bat() {
+    command batcat --theme='TwoDark' --color always --paging auto "$@"
   }
 fi
 

zshenv

@@ -37,7 +37,7 @@ export CCACHE_CONFIGPATH=$HOME/.config/ccache
 export CCACHE_DIR=$HOME/.cache/ccache
 
 # Add default CMake generator
-which ninja &> /dev/null && \
+command -v ninja &> /dev/null && \
   export CMAKE_GENERATOR=Ninja
 
 # Remove duplicates from environment variables
@@ -47,8 +47,12 @@ typeset -U MANPATH;   export MANPATH
 typeset -U INFOPATH;  export INFOPATH
 
 # Set default editor.
-which vim &> /dev/null && \
-  export EDITOR=`which vim`
+if command -v nvim &> /dev/null; then
+  export EDITOR=`command -v nvim`
+elif command -v vim &> /dev/null; then
+  export EDITOR=`command -v vim`
+fi
+export GIT_EDITOR=$EDITOR
 
 # Use ~/.local for pip installs on macOS
 [ "`uname`" = "Darwin" ] && export PYTHONUSERBASE=$HOME/.local
@@ -77,26 +81,25 @@ export PYLINTHOME=~/.local/share/pylint
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
 # If pinentry-curses exists, use it for lastpass-cli
-which pinentry-curses &> /dev/null && \
+command -v pinentry-curses &> /dev/null && \
   export LPASS_PINENTRY=pinentry-curses
 
 # Teach these some XDG Base Directory Spec manners
 export IPYTHONDIR=$HOME/.config/ipython
-which cargo &> /dev/null && \
+command -v cargo &> /dev/null && \
   export CARGO_HOME=$HOME/.local/share/cargo
-if which ccache &> /dev/null; then
+if command -v ccache &> /dev/null; then
   export CCACHE_CONFIGPATH=$HOME/.config/ccache.conf
   export CCACHE_DIR=$HOME/.cache/ccache
 fi
-which conan &> /dev/null && \
+command -v conan &> /dev/null && \
   export CONAN_USER_HOME=$HOME/.local/share/conan
-which docker &> /dev/null && \
+command -v docker &> /dev/null && \
   export DOCKER_CONFIG=$HOME/.local/share/docker
 export GTK_RC_FILES=$HOME/.config/gtk/gtkrc
 export GTK2_RC_FILES=$HOME/.config/gtk-2.0/gtkrc
-which rustup &> /dev/null && \
-  export RUSTUP_HOME=$HOME/.local/share/rustup
 export PYLINTHOME=$HOME/.cache/pylint
+command -v rustup &> /dev/null && \
+  export RUSTUP_HOME=$HOME/.local/share/rustup
+export WGETRC=$HOME/.config/wget/rc
 # TODO: terminfo
-[ -f $HOME/.config/wgetrc ] &&
-  export WGETRC=$HOME/.config/wgetrc

zshrc

@@ -17,6 +17,8 @@ ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
 
 # Search history with a command substring
 source-plugin zsh-history-substring-search
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=
 
 # Command syntax highlighting
 source-plugin zsh-syntax-highlighting
@@ -65,10 +67,10 @@ setopt completeinword
 
 # Initialize completions
 autoload -U compinit
-compinit
+compinit -d ~/.cache/zsh/compdump
 
 # Add pip to the old completion engine if present
-if which pip &> /dev/null; then
+if command -v pip &> /dev/null; then
   function _pip_completion {
     local words cword
     read -Ac words
@@ -172,15 +174,16 @@ fi
 # Frequntly used directories
 function frequent-directory() { export $1; hash -d $1 }
 frequent-directory Projects="$HOME/Projects"
+frequent-directory Sandbox="$HOME/Sandbox"
 
 # Load work related config
 [ -f ~/.config/work/zshrc ] && source ~/.config/work/zshrc
 
 # Aliases
 alias grep='grep --color=always'
-which cmake &> /dev/null && \
+command -v cmake &> /dev/null && \
   alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'
-which ssh &> /dev/null && \
+command -v ssh &> /dev/null && \
   alias ssh='TERM=xterm-256color ssh'
 alias weather="curl wttr.in"
 alias cls="clear && printf '\e[3J'"
@@ -188,15 +191,15 @@ alias cls="clear && printf '\e[3J'"
 case `uname` in
   Linux)
     alias ls='ls -F --color=auto'
-    if which cgdb &> /dev/null; then
+    if command -v cgdb &> /dev/null; then
       alias debug='cgdb --args'
-    elif which gdb &> /dev/null; then
+    elif command -v gdb &> /dev/null; then
       alias debug='gdb --args'
     fi
     ;;
   Darwin)
     alias ls='ls -GFh'
-    which lldb &> /dev/null && \
+    command -v lldb &> /dev/null && \
       alias debug='lldb --'
     ;;
 esac