Move entire git-prompt to C

2018-09-11 18:12:45 +01:00
18 changed files with 226 additions and 791 deletions
--- a/6
+++ b/6
@@ -1,6 +0,0 @@
-#!/usr/bin/env zsh
-read -p "Are you sure? [y/N]: " -n 1 -r
-echo
-if [[ $REPLY =~ ^[Yy]$ ]]; then
-  exec "$@"
-fi
--- a/.conduit.yaml
+++ b/.conduit.yaml
@@ -0,0 +1,31 @@
+---
+- location: ~/.config/zsh
+- apt:
+    - zsh
+    - zsh-doc
+- brew:
+    - zsh
+- command:
+    - install: sudo chsh -s `which zsh` $USER
+      remove: sudo chsh -s `which bash` $USER
+- symlink:
+    - {src: zlogin, dst: ~/.zlogin}
+    - {src: zlogout, dst: ~/.zlogout}
+    - {src: zprofile, dst: ~/.zprofile}
+    - {src: zshenv, dst: ~/.zshenv}
+    - {src: zshrc, dst: ~/.zshrc}
+    - src: prompt_fresh_setup
+      dst: ~/.local/share/zsh/site-functions/prompt_fresh_setup
+    - src: build/_build-dir
+      dst: ~/.local/share/zsh/site-functions/_build-dir
+    - src: sandbox/_sandbox
+      dst: ~/.local/share/zsh/site-functions/_sandbox
+    - src: layout/_layout
+      dst: ~/.local/share/zsh/site-functions/_layout
+    - src: notes/_note
+      dst: ~/.local/share/zsh/site-functions/_note
+- repo:
+    - https://github.com/zsh-users/zsh-autosuggestions.git
+    - https://github.com/zsh-users/zsh-history-substring-search.git
+    - https://github.com/zdharma/fast-syntax-highlighting.git
+- message: zsh will be the default prompt after next login
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 # Ignore all plugin files in subdirectories
-*/
+*/*
--- a/README.md
+++ b/README.md
@@ -2,13 +2,15 @@

 <!-- TODO: GIF -->

-## Ansible
+## [conduit][conduit]

-To install this Zsh configuration:
+Simple, local, configuration manager.

-```console
-$ ansible-playbook main.yaml --ask-become-pass
-```
+Installation of the configuration files in this repository is orchestrated by
+[conduit][conduit] as defined in the [`.conduit.yaml`](.conduit.yaml) file. This
+includes [Zsh][zsh] package installs, setting [Zsh][zsh] as the users default
+shell, and symbolic linking file such as [`zshrc`](zshrc) to `~/.zshrc`, and
+cloning plugin repositories. The repository is cloned to `~/.config/zsh`.

 ## Prompt

@@ -50,7 +52,8 @@ Plugins are sourced manually and their git repositories tracked by
 [conduit][conduit], no plugin manager is used.

 * [zsh-autosuggestions][zsh-autosuggestions] Fish-like autosuggestions for zsh.
-* [zsh-syntax-highlighting][syntax] Fish shell like syntax highlighting for Zsh.
+* [fast-syntax-highlighting][syntax] Optimized and extended
+  zsh-syntax-highlighting - Fish shell like syntax highlighting for Zsh.
 * [zsh-history-substring-search][search] Zsh port of the Fish shell's history
  search.

@@ -150,7 +153,7 @@ Various aliases are defined at the end of [zshrc](zshrc) for convenience.
 [git-prompt]: https://github.com/olivierverdier/zsh-git-prompt
 [zsh-autosuggestions]: https://github.com/zdharma/fast-syntax-highlighting
 [zsh-autoenv]: https://github.com/Tarrasch/zsh-autoenv
-[syntax]: https://github.com/zsh-users/zsh-syntax-highlighting
+[syntax]: https://github.com/zdharma/fast-syntax-highlighting
 [search]: https://github.com/zsh-users/zsh-history-substring-search
 [vim-mode]: https://github.com/sharat87/zsh-vim-mode
 [tmux]: https://tmux.github.io
--- a/autoenv/_autoenv
+++ b/autoenv/_autoenv
@@ -16,9 +16,6 @@ _autoenv() {
        init:'add .enter and .exit scripts in current directory'
        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 ;;
  esac
--- a/autoenv/autoenv.zsh
+++ b/autoenv/autoenv.zsh
@@ -12,7 +12,7 @@ autoenv() {
  case "$cmd" in
    -h|--help)  # Display help.
      echo "\
-usage: autoenv [-h] {init,edit,deinit,reload,add=py}
+usage: autoenv [-h] {init,edit,deinit}

 options:
        -h, --help  show this help message and exit
@@ -20,119 +20,55 @@ options:
 commands:
        init        add .enter and .exit scripts in current directory
        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"
+        deinit      remove .enter and .exit scripts in current directory"
      ;;

-    init)  # Create .enter and .exit scripts in current directory.
+    init)  # Create enter and exit scripts in current directory.
      if [ -f $PWD/.enter ] || [ -f $PWD/.exit ]; then
        echo '.enter or .exit already exists'; return 1
      fi
-      # Create the .enter and .exit scripts.
-      touch .enter .exit
+      # Create then edit enter and exit scripts.
+      touch .enter .exit && autoenv edit
      # If enter script exists, authorize it.
      [ -f $PWD/.enter ] && _autoenv_authorized $PWD/.enter yes
      # If exit script exists, authorize it.
      [ -f $PWD/.exit ] && _autoenv_authorized $PWD/.exit yes
-      # Edit the autoenv.
-      autoenv edit
-      # Enter the autoenv.
-      _autoenv_enter $PWD
-      ;;
+      # Enter the new autoenv.
+      _autoenv_enter $PWD ;;

-    edit)  # Edit .enter and .exit scripts in current directory.
+    edit)  # Edit enter and exit scripts in current directory.
      if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
        echo '.enter or .exit not found'; return 1
      fi
      # If vim exists, edit enter and exit scripts.
      if which vim &> /dev/null; then
-        # Exit the autoenv before editing.
-        _autoenv_exit $PWD
-        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.
-          [ -f $PWD/.exit ] && _autoenv_authorized $PWD/.exit yes
-        fi
-        # Enter the autoenv.
-        _autoenv_enter $PWD
+        vim -p $PWD/.enter $PWD/.exit
      else
        echo 'vim not found'; return 1
-      fi
-      ;;
+      fi ;;

-    deinit)  # Remove .enter and .exit scripts in current directory.
-      if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
-        echo '.enter or .exit not found'; return 1
-      fi
-      # Prompt user to confirm removal of enter and exit scripts.
-      while true; do
-        read "answer?Are you sure [y/N]? "
-        case "$answer" in
-          y|Y|yes)
-            # Exit the autoenv.
-            _autoenv_exit $PWD
-            # Remove enter and exit scripts if they exist.
-            [ -f $PWD/.enter ] && rm $PWD/.enter
-            [ -f $PWD/.exit ] && rm $PWD/.exit
-            break ;;
-          *) break ;;
-        esac
-      done
-      ;;
-
-    reload)  # Reload the current environment
-      if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
-        echo '.enter or .exit not found'; return 1
-      fi
-      # Exit the autoenv before editing.
-      _autoenv_exit $PWD
-      # Enter the autoenv.
-      _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 -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
-      _autoenv_enter $PWD
-      pip install pynvim
-      ;;
+    deinit)  # Remove enter and exit scripts in current directory.
+      if [ -f $PWD/.enter ] || [ -f $PWD/.exit ]; then
+        # Prompt user to confirm removal of enter and exit scripts.
+        while true; do
+          read "answer?Are you sure [y/N]? "
+          case "$answer" in
+            y|Y|yes)
+              # Remove enter and exit scripts if they exist.
+              [ -f $PWD/.enter ] && rm $PWD/.enter
+              [ -f $PWD/.exit ] && rm $PWD/.exit
+              break ;;
+            *) break ;;
+          esac
+        done
+      else
+        echo '.enter and .exit not found'; return 1
+      fi ;;

    *)  # Invalid arguments, show help then error.
      echo "invalid arguments: $@"
      autoenv --help
-      return 1
-      ;;
+      return 1 ;;
  esac
 }

--- a/build/_build-dir
+++ b/build/_build-dir
@@ -1,7 +1,6 @@
 #compdef build-dir

 _arguments \
-  '(-h --help)'{-h,--help}'[show this help message and exit]' \
-  '(-s --show)'{-s,--show}'[show the current build directory]' \
+  '(-h --help)'{-h,--help}'[]' \
  '--build[invoke a build after selection]' \
  '1:directory:_files'
--- a/build/build.plugin.zsh
+++ b/build/build.plugin.zsh
@@ -7,19 +7,7 @@ alias build="build-dir --build"
 # Detect installed debugger and set the `debug` alias to debug a program with
 # command line arguments.
 if [ `uname` = Linux ]; then
-  if [[ "`vim --version|head -1|cut -c 19-21`" =~ "^8\.[123456789]$" ]]; then
-    autoload -U regexp-replace
-    function vimdebug() {
-      # For each item in $* replace * and \* and then replace \ with \\
-      local args=()
-      for arg in "$@"; do
-        regexp-replace arg '\*' '\\*'
-        args+=($arg)
-      done
-      vim "+packadd termdebug" "+TermdebugCommand $args"
-    }
-    alias debug='vimdebug'
-  elif which cgdb &> /dev/null; then
+  if which cgdb &> /dev/null; then
    alias debug='cgdb --args'
  elif which gdb &> /dev/null; then
    alias debug='gdb --args'
@@ -32,8 +20,8 @@ fi
 # Interactively choose a `~build` directory for `build` to build.
 build-dir() {
  local usage='usage: build-dir [-h] [--build] [<directory>]'
-  local -a help show do_build
-  zparseopts -D h=help -help=help s=show -show=show -build=do_build
+  local -a help do_build
+  zparseopts -D h=help -help=help -build=do_build
  if [[ -n $help ]]; then
    cat << EOF
 $usage
@@ -45,23 +33,13 @@ 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
+  local build_dir
  if [[ ${#*} -gt 1 ]]; then
    echo $usage
    error "unexpected position arguments: ${*[2,${#*}]}"; return 1
@@ -69,24 +47,24 @@ EOF
    if [[ ! -d ${*[1]} ]]; then
      warning "directory not found: ${*[1]}"
    else
-      local_build_dir=${*[1]}
+      build_dir=${*[1]}
    fi
  fi

  # If <directory> was not set begin selection
-  if [[ -z $local_build_dir ]]; then
+  if [[ -z $build_dir ]]; then
    # Find build directories
-    local -a local_build_dirs
+    local -a build_dirs
    for entry in `ls -A`; do
      [ -d $entry ] && [[ $entry =~ build* ]] && \
-        local_build_dirs+=${entry/\//}
+        build_dirs+=${entry/\//}
    done

    # Interactively select a build directory if more than 1 found
    integer index=0
-    if [[ ${#local_build_dirs} -eq 0 ]]; then
+    if [[ ${#build_dirs} -eq 0 ]]; then
      error "no build directories found"; return 1
-    elif [[ ${#local_build_dirs} -gt 1 ]]; then
+    elif [[ ${#build_dirs} -gt 1 ]]; then
      zmodload zsh/curses && {
        # Get the size of the terminal
        local size=`stty size`
@@ -111,13 +89,13 @@ EOF
          zcurses string build-dir 'Select a build directory:'

          # Add the selections text
-          for (( i = 0; i < ${#local_build_dirs}; i++ )); do
+          for (( i = 0; i < ${#build_dirs}; i++ )); do
            integer line=$i+3
            zcurses move build-dir $line 1
            [[ $index -eq $i ]] &&
              zcurses string build-dir "* " ||
              zcurses string build-dir "  "
-            zcurses string build-dir ${local_build_dirs[$i+1]}
+            zcurses string build-dir ${build_dirs[$i+1]}
          done

          # Display the text the and wait for input
@@ -129,7 +107,7 @@ EOF
            (UP|k|$'\C-P')
              [[ $index -gt 0 ]] && index=$index-1 ;;
            (DOWN|j|$'\C-N')
-              [[ $index -lt ${#local_build_dirs}-1 ]] && index=$index+1 ;;
+              [[ $index -lt ${#build_dirs}-1 ]] && index=$index+1 ;;
            (ENTER|$'\n')
              break ;;
          esac
@@ -146,33 +124,32 @@ EOF
  # On success setup the build directory for use
  if [[ $? -eq 0 ]]; then
    # Set the build directory from selection if empty
-    [[ -z $local_build_dir ]] && \
-      local_build_dir=${local_build_dirs[$index+1]}
+    [[ -z $build_dir ]] && \
+      build_dir=${build_dirs[$index+1]}

    # If `build.ninja` exists in alias `ninja`, return.
    local build
-    [ -f $local_build_dir/build.ninja ] && \
-      build="ninja -C $local_build_dir"
+    [ -f $build_dir/build.ninja ] && \
+      build="ninja -C $build_dir"

    # If `Makefile` exists in alias `make`, return.
-    if [ -f $local_build_dir/Makefile ]; then
+    if [ -f $build_dir/Makefile ]; then
      [ `uname` = Darwin ] && \
        local cpu_count=`sysctl -n hw.ncpu` ||
        local cpu_count=`grep -c '^processor' /proc/cpuinfo`
-      build="make -j $cpu_count -C $local_build_dir"
+      build="make -j $cpu_count -C $build_dir"
    fi

    # If the build variable is not defined the command could not be determined
    if [ -z $build ]; then
-      warning "build command detection failed: $local_build_dir"
+      warning "build command detection failed: $build_dir"
      # Prompt user to enter a build command
      vared -p 'enter comand: ' build
    fi

    # Redefine the `build` alias and update the `~build` hash directory
    alias build="$build"
-    hash -d build=$local_build_dir
-    export build_dir=$local_build_dir
+    hash -d build=$build_dir

    # If `--build` is specified then evaluate the command.
    if [[ -n $do_build ]]; then
@@ -184,11 +161,11 @@ EOF
 # Build then run a target residing in `~build/bin`.
 build-run() {
  local target=$1; shift 1
-  eval build $target && ~build/bin/$target "$@"
+  eval build $target && ~build/bin/$target $*
 }

 # Build then debug a target residing in `~build/bin`.
 build-debug() {
  local target=$1; shift 1
-  eval build $target && debug ~build/bin/$target "$@"
+  eval build $target && debug ~build/bin/$target $*
 }
--- a/105
+++ b/105
@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""Uninstall a previously installed CMake installation.
-
-Read the ``install_manifest.txt`` file from a CMake build directory
-which has been installed then delete the files, and optionally the empty
-subdirectories of the install prefix, specified within.
-"""
-
-from argparse import ArgumentParser, RawDescriptionHelpFormatter
-from os import listdir, path, remove, rmdir
-from sys import stderr
-
-
-def uninstall(build_dir, recursive=False):
-    """Uninstall a previoulsy installed CMake installation.
-
-    Arguments:
-        :build_dir: Path to the build directory containing the
-        ``install_manifest.txt`` of files to uninstall.
-        :recursive: Boolean flag to enable recursively uninstall empty
-        directories up to the install prefix specified in ``CMakeCache.txt``.
-    """
-    # Get the list of installed files from the install_manifest.txt
-    install_manifest_path = path.join(build_dir, 'install_manifest.txt')
-    with open(install_manifest_path, 'r') as install_manifest_file:
-        install_manifest = sorted(install_manifest_file.read().splitlines())
-    # Delete files from the filesystem
-    removed = []
-    directories = []
-    for entry in install_manifest:
-        directories.append(path.dirname(entry))
-        if path.isfile(entry):
-            remove(entry)
-            removed.append(entry)
-    if recursive:
-        # Get the install prefix from CMakeCache.txt
-        cmakecache_path = path.join(build_dir, 'CMakeCache.txt')
-        with open(cmakecache_path, 'r') as cmakecache_file:
-            for line in cmakecache_file.read().splitlines():
-                if line.startswith('CMAKE_INSTALL_PREFIX'):
-                    prefix = path.normpath(line.split('=')[1])
-                    break
-        while True:
-            # Remove duplicates from list
-            directories = list(dict.fromkeys(directories))
-            # Find directories in list which are not empty
-            not_empty = []
-            for index, entry in enumerate(directories):
-                if listdir(entry):
-                    not_empty.append(index)
-            # Remove directories which are not empty from list
-            for index in reversed(not_empty):
-                del directories[index]
-            # Delete directories from the filesystem
-            to_del = []
-            to_append = []
-            for index, entry in enumerate(directories):
-                rmdir(entry)
-                removed.append(entry)
-                to_del.append(index)
-                parent = path.dirname(entry)
-                # Add parent directory to the list when not the install prefix
-                if path.normpath(parent) != prefix:
-                    to_append.append(parent)
-            # Remove deleted directories from list
-            for index in reversed(to_del):
-                del directories[index]
-            directories += to_append
-            # Exit loop when no more directories in list
-            if not directories:
-                break
-    return removed
-
-
-def main():
-    """Command line entry point."""
-    cli = ArgumentParser(description=__doc__,
-                         formatter_class=RawDescriptionHelpFormatter)
-    cli.add_argument('--version', action='version', version='%(prog)s 0.1.0')
-    cli.add_argument('-q',
-                     '--quiet',
-                     action='store_true',
-                     help="don't print removed entries to stdout")
-    cli.add_argument('-r',
-                     '--recursive',
-                     action='store_true',
-                     help='recursively remove empty directories')
-    cli.add_argument('build_dir',
-                     help='path to the installed CMake build directory')
-    args = cli.parse_args()
-    try:
-        removed = uninstall(args.build_dir, recursive=args.recursive)
-        if not args.quiet:
-            for entry in removed:
-                print(f'-- Uninstalling: {entry}')
-    except FileNotFoundError as error:
-        print(f'error: file not found: {error.filename}', file=stderr)
-        exit(1)
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        exit(130)
--- a/git-prompt.c
+++ b/git-prompt.c
@@ -8,23 +8,11 @@
 #include <sys/wait.h>
 #endif

-#ifdef DEBUG
 #define check(CONDITION)                                                    \
  if (CONDITION) {                                                          \
    fprintf(stderr, "error: %s: %d: %s\n", __FILE__, __LINE__, #CONDITION); \
    exit(0);                                                                \
  }
-#else
-#define check(CONDITION) \
-  if (CONDITION) {       \
-    exit(0);             \
-  }
-#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;
@@ -75,8 +63,9 @@ char* trim(char* str) {

 char* append(char* buffer, int count, ...) {
  va_list list;
+  int i;
  va_start(list, count);
-  for (int i = 0; i < count; i++) {
+  for (i = 0; i < count; i++) {
    strcat(buffer, va_arg(list, char*));
  }
  va_end(list);
@@ -89,8 +78,13 @@ char* inttostr(char* buffer, int value) {
 }

 int main() {
+  process_t process;
+  // check we are in a git repo
+  process = process_open("git rev-parse --git-dir");
+  check(process_close(process));
+
  // get the current branch name
-  process_t process = process_open("git symbolic-ref --short HEAD");
+  process = process_open("git symbolic-ref --short HEAD");
  char branch_buf[256] = {};
  fread(branch_buf, 1, sizeof(branch_buf), process.out);
  if (process_close(process)) {
@@ -109,7 +103,7 @@ int main() {
  }
  char* branch = trim(branch_buf);
  char prompt[1024] = {};
-  append(prompt, 3, " " color256(66), branch, reset);
+  append(prompt, 3, " %{%F{66}%}", branch, "%{%f%}");

  // get the upstream remote if one exists
  char command[1024] = {};
@@ -183,22 +177,22 @@ int main() {
  if (indexed || modified || deleted || unmerged || untracked) {  // modified
    char int_buf[32];
    if (indexed) {
-      append(prompt, 3, color8(2) "*", inttostr(int_buf, indexed), reset);
+      append(prompt, 3, "%{%F{2}%}*", inttostr(int_buf, indexed), "%{%f%}");
    }
    if (modified) {
-      append(prompt, 3, color8(1) "+", inttostr(int_buf, modified), reset);
+      append(prompt, 3, "%{%F{1}%}+", inttostr(int_buf, modified), "%{%f%}");
    }
    if (deleted) {
-      append(prompt, 3, color8(1) "-", inttostr(int_buf, deleted), reset);
+      append(prompt, 3, "%{%F{1}%}-", inttostr(int_buf, deleted), "%{%f%}");
    }
    if (unmerged) {
-      append(prompt, 3, bold color8(1) "×", inttostr(int_buf, unmerged), reset);
+      append(prompt, 3, "%{%B%F{1}%}×", inttostr(int_buf, unmerged), "%{%f%}");
    }
    if (untracked) {
-      append(prompt, 1, color8(1) "…" reset);
+      append(prompt, 1, "%{%F{1}%}…%{%f%}");
    }
  } else {  // clean
-    append(prompt, 1, bold color8(2) "✓" reset);
+    append(prompt, 1, "%{%B%F{2}%}✓%{%f%b%}");
  }

  // print the prompt
--- a/93
+++ b/93
@@ -27,11 +27,9 @@ prompt_fresh_setup() {
  if [ $almostontop -eq 1 ]; then
    # Hook to clear the screen then prints the prompt with previous command at
    # the top of the screen.
-    add-zsh-hook precmd fresh_almostontop_precmd
-    add-zsh-hook preexec fresh_almostontop_preexec
+    add-zsh-hook preexec fresh_almostontop
  else
-    add-zsh-hook -d preexec fresh_almostontop_preexec
-    add-zsh-hook -d precmd fresh_almostontop_precmd
+    add-zsh-hook -d preexec fresh_almostontop
  fi

  [ $recompile -eq 1 ] && prompt_cleanup
@@ -44,7 +42,7 @@ prompt_fresh_setup() {
  fi

  local userhost=$USER
-  if [ "$SSH_CONNECTION" != "" ] || [ "$DISTROBOX_ENTER_PATH" != "" ]; then
+  if [ "$SSH_CONNECTION" != "" ]; then
    local user="$user@%{%F{244}%}%M%{%f%}"
    local userhost="$userhost@`hostname`"
  fi
@@ -66,7 +64,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{220}%}$SANDBOX_NAME${PWD#$SANDBOX_HOME}%{%f%}" || \
+    local directory="%{%F{3}%}$SANDBOX_NAME${PWD#$SANDBOX_HOME}%{%f%}" || \
    local directory="%{%F{37}%}%~%{%f%}"

  # Check we are in a git repository
@@ -74,48 +72,9 @@ fresh_line_one() {

  # If the last command failed, display its error code at the right
  if [[ $exit_code -ne 0 ]]; then
-    case $exit_code in
-      129) exit_code="SIGHUP"     ;;  # 128 + 1
-      130) exit_code="SIGINT"     ;;  # 128 + 2
-      131) exit_code="SIGQUIT"    ;;  # 128 + 3
-      132) exit_code="SIGILL"     ;;  # 128 + 4
-      133) exit_code="SIGTRAP"    ;;  # 128 + 5
-      134) exit_code="SIGABRT"    ;;  # 128 + 6
-      134) exit_code="SIGIOT"     ;;  # 128 + 6
-      135) exit_code="SIGBUS"     ;;  # 128 + 7
-      136) exit_code="SIGFPE"     ;;  # 128 + 8
-      137) exit_code="SIGKILL"    ;;  # 128 + 9
-      138) exit_code="SIGUSR1"    ;;  # 128 + 10
-      139) exit_code="SIGSEGV"    ;;  # 128 + 11
-      140) exit_code="SIGUSR2"    ;;  # 128 + 12
-      141) exit_code="SIGPIPE"    ;;  # 128 + 13
-      142) exit_code="SIGALRM"    ;;  # 128 + 14
-      143) exit_code="SIGTERM"    ;;  # 128 + 15
-      144) exit_code="SIGSTKFLT"  ;;  # 128 + 16
-      145) exit_code="SIGCHLD"    ;;  # 128 + 17
-      146) exit_code="SIGCONT"    ;;  # 128 + 18
-      147) exit_code="SIGSTOP"    ;;  # 128 + 19
-      148) exit_code="SIGTSTP"    ;;  # 128 + 20
-      149) exit_code="SIGTTIN"    ;;  # 128 + 21
-      150) exit_code="SIGTTOU"    ;;  # 128 + 22
-      151) exit_code="SIGURG"     ;;  # 128 + 23
-      152) exit_code="SIGXCPU"    ;;  # 128 + 24
-      153) exit_code="SIGXFSZ"    ;;  # 128 + 25
-      154) exit_code="SIGVTALRM"  ;;  # 128 + 26
-      155) exit_code="SIGPROF"    ;;  # 128 + 27
-      156) exit_code="SIGWINCH"   ;;  # 128 + 28
-      157) exit_code="SIGIO"      ;;  # 128 + 29
-      158) exit_code="SIGPWR"     ;;  # 128 + 30
-      159) exit_code="SIGSYS"     ;;  # 128 + 31
-    esac
    local result=" %{%B%F{1}%}$exit_code%{%f%b%}"
  fi

-  # Unset vim/tmux navigate flag to handle C-z and multiple vim jobs.
-  [[ ! -z "$TMUX" ]] && \
-    [[ "`tmux show-window-options`" = *"@vim$TMUX_PANE"* ]] && \
-      tmux set-window-option -u @vim$TMUX_PANE
-
  # If a virtualenv is enabled, display it's basename
  if [[ ! -z "$VIRTUAL_ENV" ]]; then
    local py=" %{%F{4}%}py%{%f%}%{%F{3}%}$(basename $VIRTUAL_ENV)%{%f%}"
@@ -130,43 +89,10 @@ fresh_line_one() {
  print -P "$time_stamp $directory$git$py$docker$result"
 }

-# Executed before each prompt.
-fresh_almostontop_precmd() {
-  # 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 row_before
-  read -s -d \; row_before
-  # Discard suffix delimted by R otherwise it is output to the tty
-  read -s -d R
-}
-
-# Executed just after a command has been read and is about to be executed.
-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 row
-  read -s -d \; row
-  # Discard suffix delimted by R otherwise it is output to the tty
-  read -s -d R
-  # Move the cursor to the bottom of the terminal
-  # CSI ESC[<num>B moves the cursor down <num> lines
-  let "down = $LINES - $row"
-  printf "\033[${down}B"
-  # Calculate the number of lines in the prompt
-  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
-    printf "\n"
-  done
-  # Move the cursor to the line below the prompt
-  # CSI ESC[<num>A moves the cursor up <num> lines
-  let "up = $LINES - $prompt_lines"
-  printf "\033[${up}A"
+fresh_almostontop() {
+  clear
+  fresh_line_one
+  print -P "$PROMPT"'$1'
 }

 fresh_compile_git_prompt() {
@@ -174,8 +100,7 @@ fresh_compile_git_prompt() {
  # --procelain` to greatly decrease the time taken to draw the prompt
  [ ! -d ~/.cache/zsh ] && mkdir -p ~/.cache/zsh
  if [ ! -f ~/.cache/zsh/git-prompt ]; then
-    cc -std=gnu99 -O3 -DNDEBUG -Wno-unused-result \
-      ~/.config/zsh/git-prompt.c -o ~/.cache/zsh/git-prompt
+    cc -std=gnu99 -O3 -DNDEBUG ~/.config/zsh/git-prompt.c -o ~/.cache/zsh/git-prompt
    if [ $? -ne 0 ]; then
      echo "git-prompt was not compiled, is a C99 toolchain installed?"
    fi
--- a/sandbox/_sandbox
+++ b/sandbox/_sandbox
@@ -1,42 +1,46 @@
 #compdef sandbox

+__get_sandboxes() {
+  /bin/ls $SANDBOX_ROOT 2> /dev/null
+}
+
 __sandboxes() {
  local -a sandboxes
-  sandboxes=(${(fo)"$(ls $SANDBOX_ROOT 2> /dev/null)"})
+  sandboxes=(${(fo)"$(__get_sandboxes)"})
  _describe 'in' sandboxes
 }

+_sandbox_cmds() {
+  local commands; commands=(
+    'create:Create a new sandbox'
+    'rename:Rename an existing sandbox'
+    'destroy:Destroy an existing sandbox'
+    'list:Show all existing sandboxes'
+    'enable:Enable an existing sandbox'
+    'disable:Disable the current sandbox'
+  )
+  _describe -t commands 'sandbox command' commands "$@"
+}
+
 _sandbox() {
  local context curcontext="$curcontext" state line
  typeset -A opt_args

  _arguments -C \
-      '1: :->cmd' \
-      '*:: :->args'
+      '1: :_sandbox_cmds' \
+      '*::arg:->args'

  case $state in
-    (cmd)
-      local commands; commands=(
-        'create:Create a new sandbox'
-        'rename:Rename an existing sandbox'
-        'destroy:Destroy an existing sandbox'
-        'list:Show all existing sandboxes'
-        'enable:Enable an existing sandbox'
-        'disable:Disable the current sandbox'
-      )
-      _describe -t commands 'sandbox command' commands "$@"
-      ;;
-
    (args)
      curcontext="${curcontext%:*:*}:sandbox-cmd-$words[1]:"
      case $line[1] in
-        (create)
-          _arguments -C '--git[repository to clone]: :'
+        (create|list|disable)
          ;;
-        (rename|enable|destroy)
+        (enable|destroy)
          _arguments -C '1:: :__sandboxes'
          ;;
-        (list|disable)
+        (rename)
+          _arguments -C '1:: :__sandboxes'
          ;;
      esac
  esac
--- a/sandbox/sandbox.plugin.zsh
+++ b/sandbox/sandbox.plugin.zsh
@@ -3,131 +3,95 @@ if [[ "" == $SANDBOX_ROOT ]]; then
 fi

 sandbox() {
-  local usage="\
-usage: sandbox [-h] {create,rename,destroy,enable,disable,list} ..
-       sandbox create [--git <repo>] <name>
-       sandbox rename <old-name> <new-name>
-       sandbox destroy <name>
-       sandbox enable <name>
-       sandbox disable
-       sandbox list"
+  local usage="usage: sandbox {create,destroy,enable,disable} [name]"

-  error() { print -P "%F{red}error:%f $1" }
+  if [[ "" == $1 ]]; then
+    echo $usage
+    return 1
+  fi

-  local cmd=$1
-  [[ -z "$cmd" ]] && \
-    error "missing command\n$usage" && return 1
-  shift 1
-
-  case $cmd in
+  case $1 in
    create)
-      # Parse command arguments.
-      local git=false
-      for arg in $@; do
-        if [ "${arg[1]}" = - ]; then
-          if [ "$git" = true ]; then
-            error "invalid --git <repo> $arg\n$usage" && return 1
-          elif [ "$arg" = --git ]; then
-            git=true
-          else
-            error "invalid option $arg\n$usage" && return 1
-          fi
-        else
-          if [ "$git" = true ]; then
-            local repo=$arg
-            git=false
-          elif [[ -n "$name" ]]; then
-            error "invalid argument $arg\n$usage" && return 1
-          else
-            local name=$arg
-          fi
-        fi
-      done
-      unset git
-
-      [[ -z "$name" ]] && \
-        error "missing argument <name>\n$usage" && return 1
-
-      local sandbox=$SANDBOX_ROOT/$name
-      [[ -d "$sandbox" ]] && \
-        error "sandbox already exists $name" && return 1
-
-      if [[ -n "$repo" ]]; then
-        mkdir -p $SANDBOX_ROOT &> /dev/null
-        git clone $repo $sandbox
-        cd $sandbox
-      else
-        mkdir -p $sandbox &> /dev/null
-        cd $sandbox
-        git init &> /dev/null
+      if [[ "" == $2 ]]; then
+        echo $usage
+        return 1
      fi

-      echo "SANDBOX_HOME=\$(dirname -- "\$0:a")" >> $sandbox/.enter
-      echo "SANDBOX_NAME=$name" >> $sandbox/.enter
-      _autoenv_authorized $sandbox/.enter yes
+      local sandbox=$SANDBOX_ROOT/$2
+      if [[ -d $sandbox ]]; then
+        echo "Sandbox '$2' already exists"
+        return 2
+      fi

-      echo "unset SANDBOX_NAME" >> $sandbox/.exit
-      echo "unset SANDBOX_HOME" >> $sandbox/.exit
-      _autoenv_authorized $sandbox/.exit yes
+      mkdir -p $sandbox &> /dev/null
+      begin=$PWD
+      cd $sandbox

-      _autoenv_enter $sandbox
+      echo "SANDBOX_HOME=\$(dirname -- "\$0:a")" >> .enter
+      echo "SANDBOX_NAME=$2" >> .enter
+
+      echo "unset SANDBOX_NAME" >> .exit
+      echo "unset SANDBOX_HOME" >> .exit
+
+      git init &> /dev/null
+
+      cd $begin
+      cd $sandbox
      ;;
    rename)
-      local old_name=$1 new_name=$2
-      [[ -z "$old_name" ]] && \
-        error "missing argument <old-name>\n$usage" && return 1
-      [[ -z "$new_name" ]] && \
-        error "missing argument <new-name>\n$usage" && return 1
+      if [[ "" == $2 || "" == $3 ]]; then
+        echo $usage
+        return 1
+      fi

-      local old=$SANDBOX_ROOT/$old_name new=$SANDBOX_ROOT/$new_name
-      [[ ! -d "$old" ]] && \
-        error "sandbox does not exist $old_name" && return 1
-      [[ -d "$new" ]] && \
-        error "sandbox already exists $new_name" && return 1
-
-      [[ "$PWD" = "$old"* ]] && _autoenv_exit $PWD
-
-      mv $old $new
-      sed -i "s/$old_name/$new_name/g" $new/.enter
-      _autoenv_authorized $new/.enter yes
-      _autoenv_authorized $new/.exit yes
-
-      [[ "$PWD" = "$old"* ]] && cd $new
+      mv $SANDBOX_ROOT/$2 $SANDBOX_ROOT/$3
+      sed -i "" "s/$2/$3/g" $SANDBOX_ROOT/$3/.env
      ;;
    destroy)
-      local name=$1
-      [[ -z "$name" ]] && \
-        error "missing argument <name>\n$usage" && return 1
+      if [[ "" == $2 ]]; then
+        echo $usage
+        return 1
+      fi

-      local sandbox=$SANDBOX_ROOT/$name
-      [[ ! -d $sandbox ]] && \
-        error "sandbox does not exist $name" && return 1
+      local sandbox=$SANDBOX_ROOT/$2
+      if [[ ! -d $sandbox ]]; then
+        echo "Sandbox '$2' does not exist"
+        return 2
+      fi

-      [[ "$PWD" = "$sandbox"* ]] && cd ~
+      cd -
+      if [[ "${SANDBOX_ROOT##$PWD}" = "${SANDBOX_ROOT}" ]]; then
+        cd $HOME
+      fi

      rm -rf $sandbox
      ;;
    list)
-      ls -1 $SANDBOX_ROOT | less -F -K -R -X
+      /bin/ls -1 $SANDBOX_ROOT | less -F -K -R -X
      ;;
    enable)
-      local name=$1
-      [[ -z "$name" ]] && \
-        error "missing argument <name>\n$usage" && return 1
+      if [[ "" == $2 ]]; then
+        echo $usage
+        return 1
+      fi

-      local sandbox=$SANDBOX_ROOT/$name
-      [[ ! -d $sandbox ]] && \
-        error "sandbox does not exist $name" && return 1
+      local sandbox=$SANDBOX_ROOT/$2
+      if [[ ! -d $sandbox ]]; then
+        echo "Sandbox '$2' does not exist"
+        return 2
+      fi

      export SANDBOX_RETURN=$PWD
      cd $sandbox
      ;;
    disable)
-      [[ -z "$SANDBOX_RETURN" ]] && \
-        error "sandbox is not currently active" && return 1
+      if [[ -z $SANDBOX_RETURN ]]; then
+        echo "Sandbox is not currently active"
+        return 2
+      fi

      cd $SANDBOX_RETURN
-      unset SANDBOX_RETURN
+      unset $SANDBOX_RETURN
      ;;
  esac
 }
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,99 +0,0 @@
---
- name: zsh install packages
-  become: '{{package_become}}'
-  package:
-    name: zsh
-    state: present
-
- name: zsh install Debian packages
-  when: ansible_os_family == "Debian"
-  become: true
-  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:
-    repo: '{{item.repo}}'
-    dest: '{{item.dest}}'
-  with_items:
-    - repo: https://github.com/zsh-users/zsh-autosuggestions.git
-      dest: ~/.config/zsh/zsh-autosuggestions
-    - repo: https://github.com/zsh-users/zsh-history-substring-search.git
-      dest: ~/.config/zsh/zsh-history-substring-search
-    - repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
-      dest: ~/.config/zsh/zsh-syntax-highlighting
-    - repo: https://github.com/zsh-users/zsh-completions.git
-      dest: ~/.config/zsh/zsh-completions
-    - repo: https://github.com/junegunn/fzf.git
-      dest: ~/.config/zsh/fzf
-
- name: zsh install fzf binaries
-  command:
-    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
-    src: '{{item.src}}'
-    dest: '{{item.dest}}'
-  with_items:
-    - src: ~/.config/zsh/zlogin
-      dest: ~/.zlogin
-    - src: ~/.config/zsh/zlogout
-      dest: ~/.zlogout
-    - src: ~/.config/zsh/zprofile
-      dest: ~/.zprofile
-    - src: ~/.config/zsh/zshenv
-      dest: ~/.zshenv
-    - src: ~/.config/zsh/zshrc
-      dest: ~/.zshrc
-    - src: ~/.config/zsh/prompt_fresh_setup
-      dest: ~/.local/share/zsh/site-functions/prompt_fresh_setup
-    - src: ~/.config/zsh/build/_build-dir
-      dest: ~/.local/share/zsh/site-functions/_build-dir
-    - src: ~/.config/zsh/sandbox/_sandbox
-      dest: ~/.local/share/zsh/site-functions/_sandbox
-    - src: ~/.config/zsh/layout/_layout
-      dest: ~/.local/share/zsh/site-functions/_layout
-    - src: ~/.config/zsh/notes/_note
-      dest: ~/.local/share/zsh/site-functions/_note
-    - src: ~/.config/zsh/fzf/bin/fzf
-      dest: ~/.local/bin/fzf
-    - src: ~/.config/zsh/fzf/bin/fzf-tmux
-      dest: ~/.local/bin/fzf-tmux
-    - src: ~/.config/zsh/cmake-uninstall
-      dest: ~/.local/bin/cmake-uninstall
-    - src: ~/.config/zsh/$
-      dest: ~/.local/bin/$
-
- name: zsh get absolute path
-  shell: command -v zsh
-  register: zsh
-  changed_when: false
-
- name: zsh set default shell
-  user:
-    name: '{{lookup("env", "USER")}}'
-    shell: '{{zsh.stdout}}'
-  become: true
--- a/update-completion-links.zsh
+++ b/update-completion-links.zsh
@@ -1,19 +0,0 @@
-#!/usr/bin/env zsh
-
-# Check if third party completions are present.
-local zsh_completions=~/.config/zsh/zsh-completions
-[ ! -d $zsh_completions ] && return 0
-
-# Loop over all completions.
-for completion in $zsh_completions/src/_*; do
-  local name=`basename $completion`
-  local symlink=~/.local/share/zsh/site-functions/$name
-  # Remove existing completion file if it exists.
-  [ -f $symlink ] && rm $symlink
-  # Check if the command exists on the PATH.
-  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
-  fi
-done
--- a/utilities/utilities.plugin.zsh
+++ b/utilities/utilities.plugin.zsh
@@ -1,104 +0,0 @@
-# A collection of various shell utilities.
-
-autoload colors && colors
-
-# Abstract different ways to copy to the clipboard.
-if [ -n "$SSH_CONNECTION" ] ; then
-  # Use OSC-52 to set the clipboard
-  alias copy='base64 | xargs -0 printf "\033]52;c;%s\a"'
-elif [ "`uname`" = "Darwin" ]; then
-  # Use pbcopy to set the clipboard
-  alias copy='pbcopy'
-elif which xclip &> /dev/null; then
-  # Use xclip to set the clipboard
-  alias copy='xclip -selection c'
-fi
-
-# Abstract different ways to paste from the clipboard.
-# TODO: Use OSC-52 to get the clipboard, not widely supported though
-if [ "`uname`" = "Darwin" ]; then
-  # Use pbpaste to get the clipboard
-  alias paste='pbpaste'
-elif which xclip &> /dev/null; then
-  # Use xclip to get the clipboard
-  alias paste='xclip -selection c -o'
-fi
-
-# Passthrough an escape sequences tmux doesn't know about.
-tmux-dcs-passthrough() {
-  if [ -n "$TMUX" ]; then
-    printf "\x1bPtmux;\x1b$1\x1b\\"
-  else
-    printf "$1"
-  fi
-}
-
-# OSC 9 - Post a notification - supported by iTerm2, maybe others?
-notify() {
-  tmux-dcs-passthrough "\x1b]9;$*\x7"
-}
-
-# Detect the type and extract an archive file.
-extract() {
-  if [ -f $1 ]; then
-    case $1 in
-      *.tar.bz2)  tar xvjf $1 ;;
-      *.tar.gz)   tar xvzf $1 ;;
-      *.tar.xz)   [ `"uname"` = "Darwin" ] && tar xvJf $1 || tar xf $1 ;;
-      *.bz2)      bunzip2 $1 ;;
-      *.rar)      unrar x $1 ;;
-      *.gz)       gunzip $1 ;;
-      *.tar)      tar xvf $1 ;;
-      *.tbz2)     tar xvjf $1 ;;
-      *.tgz)      tar xvzf $1 ;;
-      *.zip)      unzip $1 ;;
-      *.Z)        uncompress $1 ;;
-      *.7z)       7zr x $1 ;;
-      *)          echo "$fg[red]error:$reset_color unable to extract '$1'" ;;
-    esac
-  else
-    echo "$fg[red]error:$reset_color file not found '$1'"
-  fi
-}
-
-if which bat &> /dev/null; then
-  # Wrap bat to specify a theme, always enable color, pipe the output to less.
-  # Both --theme and --color can be specified multiple times and will override
-  # these defaults.
-  bat() {
-    command bat --theme='TwoDark' --color always --paging auto "$@"
-  }
-elif which batcat &> /dev/null; then
-  bat() {
-    command batcat --theme='TwoDark' --color always --paging auto "$@"
-  }
-fi
-
-if which docker-machine &> /dev/null; then
-  # Wrap the docker command to print a message if a docker-machine is not
-  # running, rather than just stating it can not find it's socket.
-  docker() {
-    command docker "$@"
-    if ! docker-machine active &> /dev/null; then
-      echo "$fg[red]error:$reset_color no active host found, run:" \
-           "docker-machine start <machine>"
-      return 1
-    fi
-  }
-
-  # Wrap the docker-machine command to automatically update the environment.
-  # When a machine is started, set the environment variables provided by
-  # docker-machine env <machine>. When a machine is stopped, unset the same
-  # variables.
-  docker-machine() {
-    command docker-machine "$@"
-    if [ "start" = "$1" ]; then
-      eval `docker-machine env $2`
-    elif [ "stop" = "$1" ]; then
-      unset DOCKER_MACHINE_NAME
-      unset DOCKER_CERT_PATH
-      unset DOCKER_HOST
-      unset DOCKER_TLS_VERIFY
-    fi
-  }
-fi
--- a/56
+++ b/56
@@ -20,25 +20,13 @@ PATH=$HOME/.local/bin:$PATH
 MANPATH=$HOME/.local/share/man:$MANPATH
 INFOPATH=$HOME/.local/share/info:$INFOPATH

-# Add ccache compiler aliases to PATH and use XDG base dir paths
 if [ `uname` = Darwin ]; then
-  [ -d /usr/local/opt/python/libexec/bin ] && \
-    PATH=/usr/local/opt/python/libexec/bin:$PATH
  [ -f /usr/local/bin/ccache ] && \
    PATH=/usr/local/opt/ccache/libexec:$PATH
-elif [ -f /usr/bin/ccache ]; then
-  if [ -d /usr/lib/ccache/bin ]; then
-    PATH=/usr/lib/ccache/bin:$PATH
-  elif [ -d /usr/lib/ccache ]; then
+else
+  [ -f /usr/bin/ccache ] && \
    PATH=/usr/lib/ccache:$PATH
-  fi
 fi
-export CCACHE_CONFIGPATH=$HOME/.config/ccache
-export CCACHE_DIR=$HOME/.cache/ccache
-
-# Add default CMake generator
-command -v ninja &> /dev/null && \
-  export CMAKE_GENERATOR=Ninja

 # Remove duplicates from environment variables
 typeset -U fpath
@@ -46,14 +34,6 @@ typeset -U PATH;      export PATH
 typeset -U MANPATH;   export MANPATH
 typeset -U INFOPATH;  export INFOPATH

-# Set default editor.
-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

@@ -65,41 +45,11 @@ export LESS_TERMCAP_so=`printf "\e[1;40;32m"`
 export LESS_TERMCAP_se=`printf "\e[0m"`
 export LESS_TERMCAP_us=`printf "\e[0;34m"`
 export LESS_TERMCAP_ue=`printf "\e[0m"`
-# Disable storing less history
-export LESSHISTFILE=/dev/null

 # Force GoogleTest to output colors
 export GTEST_COLOR=yes
 # Allow completions for GoogleTest break on failure
 export GTEST_BREAK_ON_FAILURE=0
-# Force CTest to verbose output
-export CTEST_OUTPUT_ON_FAILURE=1

-# User ~/.local/share for persistent pylint data
-export PYLINTHOME=~/.local/share/pylint
 # Disable virtualenv prompt
-export VIRTUAL_ENV_DISABLE_PROMPT=1
-
-# If pinentry-curses exists, use it for lastpass-cli
-command -v pinentry-curses &> /dev/null && \
-  export LPASS_PINENTRY=pinentry-curses
-
-# Teach these some XDG Base Directory Spec manners
-export IPYTHONDIR=$HOME/.config/ipython
-command -v cargo &> /dev/null && \
-  export CARGO_HOME=$HOME/.local/share/cargo
-if command -v ccache &> /dev/null; then
-  export CCACHE_CONFIGPATH=$HOME/.config/ccache.conf
-  export CCACHE_DIR=$HOME/.cache/ccache
-fi
-command -v conan &> /dev/null && \
-  export CONAN_USER_HOME=$HOME/.local/share/conan
-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
-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
+VIRTUAL_ENV_DISABLE_PROMPT=1
--- a/54
+++ b/54
@@ -17,11 +17,13 @@ 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
+source-plugin fast-syntax-highlighting
+fast-theme -q ~/.config/zsh/fresh.ini
+
+# Automatically source .enter and .exit scripts on cd
+source-plugin autoenv

 # Build system helper commands
 source-plugin build
@@ -29,12 +31,6 @@ source-plugin build
 # Project sandboxing commands
 source-plugin sandbox

-# Various shell utilities
-source-plugin utilities
-
-# Automatically source .enter and .exit scripts on cd
-source-plugin autoenv
-
 # Layout tmux window commands
 [ "$TMUX" != "" ] && source-plugin layout

@@ -67,10 +63,10 @@ setopt completeinword

 # Initialize completions
 autoload -U compinit
-compinit -d ~/.cache/zsh/compdump
+compinit

 # Add pip to the old completion engine if present
-if command -v pip &> /dev/null; then
+if which pip &> /dev/null; then
  function _pip_completion {
    local words cword
    read -Ac words
@@ -131,22 +127,17 @@ autoload -U edit-command-line
 zle -N edit-command-line
 bindkey -M vicmd '^V' edit-command-line

-# Enable HOME and END keys
-if [[ `uname` = Linux ]]; then
-  # If Home and End are not working as expected setup zkbd mappings.
-  [ -f ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE} ] && \
-    source ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
-  [[ -n ${key[Home]} ]] && bindkey "${key[Home]}" beginning-of-line
-  [[ -n ${key[End]} ]] && bindkey "${key[End]}" end-of-line
-fi
+# Get the shells parent process name.
+ppid_name() { echo $(ps -p $(ps -p $(echo $$) -o ppid=) -o comm=) }

 # Enable changing cursor shape based on vi mode
 if [ "$ITERM_PROFILE" != "" ] && [ "$TMUX" = "" ]; then
  # iTerm2 cursor shape escape sequences outside tmux
  cursor_block="\e]50;CursorShape=0\C-G"
  cursor_line="\e]50;CursorShape=1\C-G"
-else
-  # iTerm2 inside tmux or VTE compatible cursor shape escape sequences.
+elif [ "$(ppid_name)" != "python2" ]; then
+  # iTerm2 inside tmux or VTE compatible cursor shape escape sequences,
+  # exclude Guake even though it's VTE based it doesn't like these
  cursor_block="\e[2 q"
  cursor_line="\e[6 q"
 fi
@@ -171,35 +162,32 @@ if [[ ! -z "$cursor_block" && ! -z "$cursor_line" ]]; then
  zle -N zle-line-finish
 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'
-command -v cmake &> /dev/null && \
+which cmake &> /dev/null && \
  alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'
-command -v ssh &> /dev/null && \
+which ssh &> /dev/null && \
  alias ssh='TERM=xterm-256color ssh'
-alias weather="curl wttr.in"
-alias cls="clear && printf '\e[3J'"

 case `uname` in
  Linux)
+    [ "$TMUX" = "" ] && \
+      alias cls="printf '\ec'" || \
+      alias cls="clear && printf '\e[3J'"
    alias ls='ls -F --color=auto'
-    if command -v cgdb &> /dev/null; then
+    if which cgdb &> /dev/null; then
      alias debug='cgdb --args'
-    elif command -v gdb &> /dev/null; then
+    elif which gdb &> /dev/null; then
      alias debug='gdb --args'
    fi
    ;;
  Darwin)
+    alias cls="clear && printf '\e[3J'"
    alias ls='ls -GFh'
-    command -v lldb &> /dev/null && \
+    which lldb &> /dev/null && \
      alias debug='lldb --'
    ;;
 esac