Upgrade Oh-my-zsh

2026-05-21 18:25:46 +01:00 · 2020-04-19 09:38:02 +01:00
parent b00fd49b00
commit c6ab2bc336
184 changed files with 7108 additions and 4519 deletions
@@ -14,7 +14,7 @@ Finally, you'll begin to get the sort of attention that you have always felt you

 To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and/or join us on Discord.

-![Check Suite](https://github.com/ohmyzsh/ohmyzsh/workflows/Check%20Suite/badge.svg)
+[![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/bpXWhnN)

@@ -25,7 +25,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 * A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL is preferred, but cygwin or msys also mostly work.
 * [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (run `zsh --version` to confirm), check the following instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
-* `git` should be installed
+* `git` should be installed (recommended v1.7.2 or higher)

 ### Basic Installation

@@ -133,6 +133,12 @@ ZSH_THEME_RANDOM_CANDIDATES=(
 )
 ```

+If you only know which themes you don't like, you can add them similarly to a blacklist:
+
+```shell
+ZSH_THEME_RANDOM_BLACKLIST=(pygmalion tjkirch_mod)
+```
+
 ### FAQ

 If you have some more questions or issues, you might find a solution in our [FAQ](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ).
@@ -1 +1 @@
-LAST_EPOCH=18290
+LAST_EPOCH=18360
@@ -1,60 +0,0 @@
-###-begin-npm-completion-###
-#
-# npm command completion script
-#
-# Installation: npm completion >> ~/.bashrc  (or ~/.zshrc)
-# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm
-#
-
-if type complete &>/dev/null; then
-  _npm_completion () {
-    local words cword
-    if type _get_comp_words_by_ref &>/dev/null; then
-      _get_comp_words_by_ref -n = -n @ -n : -w words -i cword
-    else
-      cword="$COMP_CWORD"
-      words=("${COMP_WORDS[@]}")
-    fi
-
-    local si="$IFS"
-    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \
-                           COMP_LINE="$COMP_LINE" \
-                           COMP_POINT="$COMP_POINT" \
-                           npm completion -- "${words[@]}" \
-                           2>/dev/null)) || return $?
-    IFS="$si"
-    if type __ltrim_colon_completions &>/dev/null; then
-      __ltrim_colon_completions "${words[cword]}"
-    fi
-  }
-  complete -o default -F _npm_completion npm
-elif type compdef &>/dev/null; then
-  _npm_completion() {
-    local si=$IFS
-    compadd -- $(COMP_CWORD=$((CURRENT-1)) \
-                 COMP_LINE=$BUFFER \
-                 COMP_POINT=0 \
-                 npm completion -- "${words[@]}" \
-                 2>/dev/null)
-    IFS=$si
-  }
-  compdef _npm_completion npm
-elif type compctl &>/dev/null; then
-  _npm_completion () {
-    local cword line point words si
-    read -Ac words
-    read -cn cword
-    let cword-=1
-    read -l line
-    read -ln point
-    si="$IFS"
-    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
-                       COMP_LINE="$line" \
-                       COMP_POINT="$point" \
-                       npm completion -- "${words[@]}" \
-                       2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  compctl -K _npm_completion npm
-fi
-###-end-npm-completion-###
@@ -1 +1 @@
-05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5		branch 'master' of https://github.com/robbyrussell/oh-my-zsh
+31eca46ee3b94ca84a038628e0bf6089a7488908		branch 'master' of https://github.com/ohmyzsh/ohmyzsh
@@ -1 +1 @@
-3e4d10c4f17b2fe57090a524d5d78781beda204a
+11ccf2bbf21a52536b408095af0e25574c7e62f5
@@ -3,9 +3,17 @@
 	filemode = true
 	bare = false
 	logallrefupdates = true
+	eol = lf
+	autocrlf = false
 [remote "origin"]
-	url = https://github.com/robbyrussell/oh-my-zsh.git
+	url = https://github.com/ohmyzsh/ohmyzsh.git
 	fetch = +refs/heads/master:refs/remotes/origin/master
 [branch "master"]
 	remote = origin
 	merge = refs/heads/master
+[fsck]
+	zeroPaddedFilemode = ignore
+[fetch "fsck"]
+	zeroPaddedFilemode = ignore
+[receive "fsck"]
+	zeroPaddedFilemode = ignore
@@ -22,3 +22,9 @@ e38099de96e8b62976354b468da1b21ec2d57f68 52f58785645c18aa88ea515d070a42bcfe97508
 52f58785645c18aa88ea515d070a42bcfe97508d 3e4d10c4f17b2fe57090a524d5d78781beda204a DazAh <9095216+DazAh@users.noreply.github.com> 1571311756 +0100	pull: Fast-forward
 3e4d10c4f17b2fe57090a524d5d78781beda204a 3e4d10c4f17b2fe57090a524d5d78781beda204a DazAh <9095216+DazAh@users.noreply.github.com> 1580316543 +0000	reset: moving to HEAD
 3e4d10c4f17b2fe57090a524d5d78781beda204a 05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 DazAh <9095216+DazAh@users.noreply.github.com> 1580316594 +0000	pull --rebase --stat origin master: Fast-forward
+05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 11ccf2bbf21a52536b408095af0e25574c7e62f5 DazAh <9095216+DazAh@users.noreply.github.com> 1587285053 +0100	commit: deleted: cache/.gitkeep
+11ccf2bbf21a52536b408095af0e25574c7e62f5 5fc3c3fca4eb259cbb2a68435a11a8fffec6539f DazAh <9095216+DazAh@users.noreply.github.com> 1587285072 +0100	commit: commit message
+5fc3c3fca4eb259cbb2a68435a11a8fffec6539f 31eca46ee3b94ca84a038628e0bf6089a7488908 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	rebase (start): checkout 31eca46ee3b94ca84a038628e0bf6089a7488908
+31eca46ee3b94ca84a038628e0bf6089a7488908 486857f709aa2fa229391097651e043b62d316e5 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	rebase (pick): deleted: cache/.gitkeep
+486857f709aa2fa229391097651e043b62d316e5 fab59ebc3d2ce439a70bd7a68a987c0a895b2ca0 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	rebase (pick): commit message
+fab59ebc3d2ce439a70bd7a68a987c0a895b2ca0 fab59ebc3d2ce439a70bd7a68a987c0a895b2ca0 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	rebase (finish): returning to refs/heads/master
@@ -18,3 +18,6 @@ a4f6a9964ceec3d222a8caa8eb3e5cf6027cfbab 32338fd40cae45c775dadc34ae05476811a3834
 e38099de96e8b62976354b468da1b21ec2d57f68 52f58785645c18aa88ea515d070a42bcfe97508d Darren Leatherbarrow <darren@DarrenPC.dazeerrcloud.xyz> 1570875427 +0100	pull: Fast-forward
 52f58785645c18aa88ea515d070a42bcfe97508d 3e4d10c4f17b2fe57090a524d5d78781beda204a DazAh <9095216+DazAh@users.noreply.github.com> 1571311756 +0100	pull: Fast-forward
 3e4d10c4f17b2fe57090a524d5d78781beda204a 05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 DazAh <9095216+DazAh@users.noreply.github.com> 1580316594 +0000	pull --rebase --stat origin master: Fast-forward
+05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 11ccf2bbf21a52536b408095af0e25574c7e62f5 DazAh <9095216+DazAh@users.noreply.github.com> 1587285053 +0100	commit: deleted: cache/.gitkeep
+11ccf2bbf21a52536b408095af0e25574c7e62f5 5fc3c3fca4eb259cbb2a68435a11a8fffec6539f DazAh <9095216+DazAh@users.noreply.github.com> 1587285072 +0100	commit: commit message
+5fc3c3fca4eb259cbb2a68435a11a8fffec6539f fab59ebc3d2ce439a70bd7a68a987c0a895b2ca0 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	rebase (finish): refs/heads/master onto 31eca46ee3b94ca84a038628e0bf6089a7488908
@@ -17,3 +17,4 @@ a4f6a9964ceec3d222a8caa8eb3e5cf6027cfbab 32338fd40cae45c775dadc34ae05476811a3834
 e38099de96e8b62976354b468da1b21ec2d57f68 52f58785645c18aa88ea515d070a42bcfe97508d Darren Leatherbarrow <darren@DarrenPC.dazeerrcloud.xyz> 1570875427 +0100	pull: fast-forward
 52f58785645c18aa88ea515d070a42bcfe97508d 3e4d10c4f17b2fe57090a524d5d78781beda204a DazAh <9095216+DazAh@users.noreply.github.com> 1571311756 +0100	pull: fast-forward
 3e4d10c4f17b2fe57090a524d5d78781beda204a 05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 DazAh <9095216+DazAh@users.noreply.github.com> 1580316594 +0000	pull --rebase --stat origin master: fast-forward
+05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5 31eca46ee3b94ca84a038628e0bf6089a7488908 DazAh <9095216+DazAh@users.noreply.github.com> 1587285078 +0100	pull --rebase --stat origin master: fast-forward
@@ -1 +1 @@
-05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5
+fab59ebc3d2ce439a70bd7a68a987c0a895b2ca0
@@ -1 +1 @@
-05a38c8b99ea5bc54e7fdfc1cc1ea6d2729c05e5
+31eca46ee3b94ca84a038628e0bf6089a7488908
@@ -1,6 +1,7 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve Oh My Zsh
+labels: 'Type: support'

 ---

@@ -10,29 +11,26 @@ an issue where no sections have been filled will be deleted without comment.
 -->

 **Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
+A clear description of what the bug is.

 **To Reproduce**
-<!--
-Steps to reproduce the behavior:
-1. Enable plugin '...'
-2. Run command '...', _or_ try to complete command '...', _etc._
+Steps to reproduce the behavior, for example:
+1. Enable this plugin '...'
+2. Run command '...' or try the autocomplete command '...'
 3. See error
-->

 **Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
+A brief description of what should happen.

-**Screenshots or recordings**
-<!--
-If applicable, add screenshots or record an asciinema session (https://asciinema.org/)
-to help explain your problem.
-->
+**Screenshots and/or Recordings**
+If applicable, add screenshots to help explain your problem.
+You can also record an asciinema session: https://asciinema.org/

-**System:**
- - OS: [e.g. macOS]
- - Zsh version [e.g. 5.6]
+**Desktop (please complete the following information):**
+ - OS / Distro: [e.g. Arch Linux, macOS]
+ - Latest ohmyzsh Update?: [e.g. Yes/No]
+ - ZSH Version: [e.g. 5.6]
 - Terminal emulator [e.g. iTerm2]

 **Additional context**
-<!-- Add any other context about the problem here. -->
+Add any other context about the problem here. This can be themes, plugins, custom configs.
@@ -11,16 +11,16 @@ an issue where no sections have been filled will be deleted without comment.
 -->

 **Is your feature request related to a particular plugin or theme? If so, specify it.**
-<!-- The name of the plugin or theme you'd like us to improve. -->
+The name of the plugin or theme that you would like us to improve. [...]

 **Is your feature request related to a problem? Please describe.**
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+A description of what the problem is. Ex. I'm always frustrated when [...]

 **Describe the solution you'd like**
-<!-- A clear and concise description of what you want to happen. -->
+A description of what you want to happen.

 **Describe alternatives you've considered**
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+A description of any alternative solutions or features you've considered. This can also include other plugins or aliases.

 **Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
+Add any other context or screenshots about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
@@ -5,8 +5,6 @@ labels: 'Type: support'

 ---

-<!--
 1. Look for similar issues already posted (including closed ones)
 2. Include as much relevant information as possible
 3. Try to make sure the issue is due to Oh My Zsh
-->
@@ -1,36 +0,0 @@
-name: Check Suite
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-    branches:
-      - master
-  push:
-    branches: 
-      - master
-
-jobs:
-  tests:
-    name: Run tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    steps:
-      - name: Set up git repository
-        uses: actions/checkout@v2
-      - name: Install zsh
-        if: runner.os == 'Linux'
-        run: sudo apt-get update; sudo apt-get install zsh
-      - name: Test installer
-        run: sh ./tools/install.sh
-      - name: Check syntax
-        run: |
-          for file in ./oh-my-zsh.sh \
-                      ./lib/*.zsh \
-                      ./plugins/*/*.plugin.zsh \
-                      ./plugins/*/_* \
-                      ./themes/*.zsh-theme; do
-            zsh -n "$file" || return 1
-          done
@@ -3,10 +3,23 @@
 # This file has support for doing system clipboard copy and paste operations
 # from the command line in a generic cross-platform fashion.
 #
-# On OS X and Windows, the main system clipboard or "pasteboard" is used. On other
-# Unix-like OSes, this considers the X Windows CLIPBOARD selection to be the
-# "system clipboard", and the X Windows `xclip` command must be installed.
-
+# This is uses essentially the same heuristic as neovim, with the additional
+# special support for Cygwin.
+# See: https://github.com/neovim/neovim/blob/e682d799fa3cf2e80a02d00c6ea874599d58f0e7/runtime/autoload/provider/clipboard.vim#L55-L121
+#
+# - pbcopy, pbpaste (macOS)
+# - cygwin (Windows running Cygwin)
+# - wl-copy, wl-paste (if $WAYLAND_DISPLAY is set)
+# - xclip (if $DISPLAY is set)
+# - xsel (if $DISPLAY is set)
+# - lemonade (for SSH) https://github.com/pocke/lemonade
+# - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
+# - win32yank (Windows)
+# - tmux (if $TMUX is set)
+#
+# Defines two functions, clipcopy and clippaste, based on the detected platform.
+##
+#
 # clipcopy - Copy data to clipboard
 #
 # Usage:
@@ -15,41 +28,8 @@
 #
 #  clipcopy <file>         - copies a file's contents to clipboard
 #
-function clipcopy() {
-  emulate -L zsh
-  local file=$1
-  if [[ $OSTYPE == darwin* ]]; then
-    if [[ -z $file ]]; then
-      pbcopy
-    else
-      cat $file | pbcopy
-    fi
-  elif [[ $OSTYPE == (cygwin|msys)* ]]; then
-    if [[ -z $file ]]; then
-      cat > /dev/clipboard
-    else
-      cat $file > /dev/clipboard
-    fi
-  else
-    if (( $+commands[xclip] )); then
-      if [[ -z $file ]]; then
-        xclip -in -selection clipboard
-      else
-        xclip -in -selection clipboard $file
-      fi
-    elif (( $+commands[xsel] )); then
-      if [[ -z $file ]]; then
-        xsel --clipboard --input 
-      else
-        cat "$file" | xsel --clipboard --input
-      fi
-    else
-      print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
-      return 1
-    fi
-  fi
-}
-
+##
+#
 # clippaste - "Paste" data from clipboard to stdout
 #
 # Usage:
@@ -67,20 +47,61 @@ function clipcopy() {
 #
 #   # Paste to a file
 #   clippaste > file.txt
-function clippaste() {
+#
+function detect-clipboard() {
  emulate -L zsh
-  if [[ $OSTYPE == darwin* ]]; then
-    pbpaste
-  elif [[ $OSTYPE == (cygwin|msys)* ]]; then
-    cat /dev/clipboard
+
+  if [[ "${OSTYPE}" == darwin* ]] && (( ${+commands[pbcopy]} )) && (( ${+commands[pbpaste]} )); then
+    function clipcopy() { pbcopy < "${1:-/dev/stdin}"; }
+    function clippaste() { pbpaste; }
+  elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
+    function clipcopy() { cat "${1:-/dev/stdin}" > /dev/clipboard; }
+    function clippaste() { cat /dev/clipboard; }
+  elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
+    function clipcopy() { wl-copy < "${1:-/dev/stdin}"; }
+    function clippaste() { wl-paste; }
+  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xclip]} )); then
+    function clipcopy() { xclip -in -selection clipboard < "${1:-/dev/stdin}"; }
+    function clippaste() { xclip -out -selection clipboard; }
+  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xsel]} )); then
+    function clipcopy() { xsel --clipboard --input < "${1:-/dev/stdin}"; }
+    function clippaste() { xsel --clipboard --output; }
+  elif (( ${+commands[lemonade]} )); then
+    function clipcopy() { lemonade copy < "${1:-/dev/stdin}"; }
+    function clippaste() { lemonade paste; }
+  elif (( ${+commands[doitclient]} )); then
+    function clipcopy() { doitclient wclip < "${1:-/dev/stdin}"; }
+    function clippaste() { doitclient wclip -r; }
+  elif (( ${+commands[win32yank]} )); then
+    function clipcopy() { win32yank -i < "${1:-/dev/stdin}"; }
+    function clippaste() { win32yank -o; }
+  elif [[ $OSTYPE == linux-android* ]] && (( $+commands[termux-clipboard-set] )); then
+    function clipcopy() { termux-clipboard-set "${1:-/dev/stdin}"; }
+    function clippaste() { termux-clipboard-get; }
+  elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
+    function clipcopy() { tmux load-buffer "${1:--}"; }
+    function clippaste() { tmux save-buffer -; }
+  elif [[ $(uname -r) = *icrosoft* ]]; then
+    function clipcopy() { clip.exe < "${1:-/dev/stdin}"; }
+    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
  else
-    if (( $+commands[xclip] )); then
-      xclip -out -selection clipboard
-    elif (( $+commands[xsel] )); then
-      xsel --clipboard --output
-    else
-      print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
-      return 1
-    fi
+    function _retry_clipboard_detection_or_fail() {
+      local clipcmd="${1}"; shift
+      if detect-clipboard; then
+        "${clipcmd}" "$@"
+      else
+        print "${clipcmd}: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
+        return 1
+      fi
+    }
+    function clipcopy() { _retry_clipboard_detection_or_fail clipcopy "$@"; }
+    function clippaste() { _retry_clipboard_detection_or_fail clippaste "$@"; }
+    return 1
  fi
 }
+
+# Detect at startup. A non-zero exit here indicates that the dummy clipboards were set,
+# which is not really an error. If the user calls them, they will attempt to redetect
+# (for example, perhaps the user has now installed xclip) and then either print an error
+# or proceed successfully.
+detect-clipboard || true
@@ -71,3 +71,6 @@ if [[ $COMPLETION_WAITING_DOTS = true ]]; then
  zle -N expand-or-complete-with-dots
  bindkey "^I" expand-or-complete-with-dots
 fi
+
+# automatically load bash completion functions
+autoload -U +X bashcompinit && bashcompinit
@@ -3,11 +3,12 @@ function zsh_stats() {
 }

 function uninstall_oh_my_zsh() {
-  env ZSH=$ZSH sh $ZSH/tools/uninstall.sh
+  env ZSH="$ZSH" sh "$ZSH/tools/uninstall.sh"
 }

 function upgrade_oh_my_zsh() {
-  env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
+  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+  command rm -rf "$ZSH/log/update.lock"
 }

 function take() {
@@ -88,7 +89,7 @@ function default() {
 #    0 if the env variable exists, 3 if it was set
 #
 function env_default() {
-    (( ${${(@f):-$(typeset +xg)}[(I)$1]} )) && return 0
+    [[ ${parameters[$1]} = *-export* ]] && return 0
    export "$1=$2" && return 3
 }

@@ -199,3 +199,12 @@ function git_current_user_name() {
 function git_current_user_email() {
  command git config user.email 2>/dev/null
 }
+
+# Output the name of the root directory of the git repository
+# Usage example: $(git_repo_name)
+function git_repo_name() {
+  local repo_path
+  if repo_path="$(git rev-parse --show-toplevel 2>/dev/null)" && [[ -n "$repo_path" ]]; then
+    echo ${repo_path:t}
+  fi
+}
@@ -1,28 +1,41 @@
-# is x grep argument available?
-grep-flag-available() {
-    echo | grep $1 "" >/dev/null 2>&1
-}
+__GREP_CACHE_FILE="$ZSH_CACHE_DIR"/grep-alias

-GREP_OPTIONS=""
+# See if there's a cache file modified in the last day
+__GREP_ALIAS_CACHES=("$__GREP_CACHE_FILE"(Nm-1))
+if [[ -n "$__GREP_ALIAS_CACHES" ]]; then
+    source "$__GREP_CACHE_FILE"
+else
+    grep-flags-available() {
+        command grep "$@" "" &>/dev/null <<< ""
+    }

-# color grep results
-if grep-flag-available --color=auto; then
-    GREP_OPTIONS+=" --color=auto"
+    # Ignore these folders (if the necessary grep flags are available)
+    EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+
+    # Check for --exclude-dir, otherwise check for --exclude. If --exclude
+    # isn't available, --color won't be either (they were released at the same
+    # time (v2.5): https://git.savannah.gnu.org/cgit/grep.git/tree/NEWS?id=1236f007
+    if grep-flags-available --color=auto --exclude-dir=.cvs; then
+        GREP_OPTIONS="--color=auto --exclude-dir=$EXC_FOLDERS"
+    elif grep-flags-available --color=auto --exclude=.cvs; then
+        GREP_OPTIONS="--color=auto --exclude=$EXC_FOLDERS"
+    fi
+
+    if [[ -n "$GREP_OPTIONS" ]]; then
+        # export grep, egrep and fgrep settings
+        alias grep="grep $GREP_OPTIONS"
+        alias egrep="egrep $GREP_OPTIONS"
+        alias fgrep="fgrep $GREP_OPTIONS"
+
+        # write to cache file if cache directory is writable
+        if [[ -w "$ZSH_CACHE_DIR" ]]; then
+            alias -L grep egrep fgrep >| "$__GREP_CACHE_FILE"
+        fi
+    fi
+
+    # Clean up
+    unset GREP_OPTIONS EXC_FOLDERS
+    unfunction grep-flags-available
 fi

-# ignore VCS folders (if the necessary grep flags are available)
-VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}"
-
-if grep-flag-available --exclude-dir=.cvs; then
-    GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"
-elif grep-flag-available --exclude=.cvs; then
-    GREP_OPTIONS+=" --exclude=$VCS_FOLDERS"
-fi
-
-# export grep settings
-alias grep="grep $GREP_OPTIONS"
-
-# clean up
-unset GREP_OPTIONS
-unset VCS_FOLDERS
-unfunction grep-flag-available
+unset __GREP_CACHE_FILE __GREP_ALIAS_CACHES
@@ -3,15 +3,15 @@ autoload -Uz is-at-least
 # *-magic is known buggy in some versions; disable if so
 if [[ $DISABLE_MAGIC_FUNCTIONS != true ]]; then
  for d in $fpath; do
-  	if [[ -e "$d/url-quote-magic" ]]; then
-  		if is-at-least 5.1; then
-  			autoload -Uz bracketed-paste-magic
-  			zle -N bracketed-paste bracketed-paste-magic
-  		fi
-  		autoload -Uz url-quote-magic
-  		zle -N self-insert url-quote-magic
-      break
-  	fi
+    if [[ -e "$d/url-quote-magic" ]]; then
+      if is-at-least 5.1; then
+        autoload -Uz bracketed-paste-magic
+        zle -N bracketed-paste bracketed-paste-magic
+      fi
+      autoload -Uz url-quote-magic
+      zle -N self-insert url-quote-magic
+    break
+    fi
  done
 fi

@@ -25,7 +25,7 @@ env_default 'LESS' '-R'
 alias _='sudo '

 ## more intelligent acking for ubuntu users
-if which ack-grep &> /dev/null; then
+if (( $+commands[ack-grep] )); then
  alias afind='ack-grep -il'
 else
  alias afind='ack -il'
@@ -1,4 +1,3 @@
-#! /bin/zsh
 # A script to make using 256 colors in zsh less painful.
 # P.C. Shyamshankar <sykora@lucentbeing.com>
 # Copied from https://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
@@ -6,32 +5,31 @@
 typeset -AHg FX FG BG

 FX=(
-    reset     "%{[00m%}"
-    bold      "%{[01m%}" no-bold      "%{[22m%}"
-    italic    "%{[03m%}" no-italic    "%{[23m%}"
-    underline "%{[04m%}" no-underline "%{[24m%}"
-    blink     "%{[05m%}" no-blink     "%{[25m%}"
-    reverse   "%{[07m%}" no-reverse   "%{[27m%}"
+  reset     "%{[00m%}"
+  bold      "%{[01m%}" no-bold      "%{[22m%}"
+  italic    "%{[03m%}" no-italic    "%{[23m%}"
+  underline "%{[04m%}" no-underline "%{[24m%}"
+  blink     "%{[05m%}" no-blink     "%{[25m%}"
+  reverse   "%{[07m%}" no-reverse   "%{[27m%}"
 )

 for color in {000..255}; do
-    FG[$color]="%{[38;5;${color}m%}"
-    BG[$color]="%{[48;5;${color}m%}"
+  FG[$color]="%{[38;5;${color}m%}"
+  BG[$color]="%{[48;5;${color}m%}"
 done

-
-ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
-
 # Show all 256 colors with color number
 function spectrum_ls() {
+  local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
  for code in {000..255}; do
-    print -P -- "$code: %{$FG[$code]%}$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: $FG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
  done
 }

 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
+  local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
  for code in {000..255}; do
-    print -P -- "$code: %{$BG[$code]%}$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: $BG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
  done
 }
@@ -17,7 +17,7 @@ function title {
  : ${2=$1}

  case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|ansi)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi)
      print -Pn "\e]2;$2:q\a" # set window name
      print -Pn "\e]1;$1:q\a" # set tab name
      ;;
@@ -32,10 +32,10 @@ function title {
        # Try to use terminfo to set the title
        # If the feature is available set title
        if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then
-	  echoti tsl
-	  print -Pn "$1"
-	  echoti fsl
-	fi
+          echoti tsl
+          print -Pn "$1"
+          echoti fsl
+        fi
      fi
      ;;
  esac
@@ -50,22 +50,52 @@ fi

 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  emulate -L zsh
-
-  if [[ "$DISABLE_AUTO_TITLE" == true ]]; then
-    return
-  fi
-
+  [[ "$DISABLE_AUTO_TITLE" == true ]] && return
  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }

 # Runs before executing the command
 function omz_termsupport_preexec {
+  [[ "$DISABLE_AUTO_TITLE" == true ]] && return
+
  emulate -L zsh
  setopt extended_glob

-  if [[ "$DISABLE_AUTO_TITLE" == true ]]; then
-    return
+  # split command into array of arguments
+  local -a cmdargs
+  cmdargs=("${(z)2}")
+  # if running fg, extract the command from the job description
+  if [[ "${cmdargs[1]}" = fg ]]; then
+    # get the job id from the first argument passed to the fg command
+    local job_id jobspec="${cmdargs[2]#%}"
+    # logic based on jobs arguments:
+    # http://zsh.sourceforge.net/Doc/Release/Jobs-_0026-Signals.html#Jobs
+    # https://www.zsh.org/mla/users/2007/msg00704.html
+    case "$jobspec" in
+      <->) # %number argument:
+        # use the same <number> passed as an argument
+        job_id=${jobspec} ;;
+      ""|%|+) # empty, %% or %+ argument:
+        # use the current job, which appears with a + in $jobstates:
+        # suspended:+:5071=suspended (tty output)
+        job_id=${(k)jobstates[(r)*:+:*]} ;;
+      -) # %- argument:
+        # use the previous job, which appears with a - in $jobstates:
+        # suspended:-:6493=suspended (signal)
+        job_id=${(k)jobstates[(r)*:-:*]} ;;
+      [?]*) # %?string argument:
+        # use $jobtexts to match for a job whose command *contains* <string>
+        job_id=${(k)jobtexts[(r)*${(Q)jobspec}*]} ;;
+      *) # %string argument:
+        # use $jobtexts to match for a job whose command *starts with* <string>
+        job_id=${(k)jobtexts[(r)${(Q)jobspec}*]} ;;
+    esac
+
+    # override preexec function arguments with job command
+    if [[ -n "${jobtexts[$job_id]}" ]]; then
+      1="${jobtexts[$job_id]}"
+      2="${jobtexts[$job_id]}"
+    fi
  fi

  # cmd name only, or if this is sudo or ssh, the next cmd
@@ -91,12 +121,13 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
  function update_terminalapp_cwd() {
    emulate -L zsh

-    # Percent-encode the pathname.
-    local URL_PATH="$(omz_urlencode -P $PWD)"
-    [[ $? != 0 ]] && return 1
+    # Percent-encode the host and path names.
+    local URL_HOST URL_PATH
+    URL_HOST="$(omz_urlencode -P $HOST)" || return 1
+    URL_PATH="$(omz_urlencode -P $PWD)" || return 1

    # Undocumented Terminal.app-specific control sequence
-    printf '\e]7;%s\a' "file://$HOST$URL_PATH"
+    printf '\e]7;%s\a' "file://$URL_HOST$URL_PATH"
  }

  # Use a precmd hook instead of a chpwd hook to avoid contaminating output
@@ -1,19 +1,21 @@
-## APACHE2 MACPORTS PLUGIN
+# apache2-macports plugin

+Enables aliases to control a local Apache2 installed via [MacPorts](https://www.macports.org/).

---
+To use it, add `apache2-macports` to the plugins array in your zshrc file:

-### FEATURES
+```zsh
+plugins=(... apache2-macports)
+```

-| Alias          | Function                                                                       | Description           |
-|:--------------:|:-------------------------------------------------------------------------------|----------------------:|
-| apache2restart | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper restart | Restart apache daemon |
-| apache2start   | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper start   | Start apache daemon   |
-| apache2stop    | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper stop    | Stop apache daemon    |
+## Aliases

---
+| Alias          | Function                                | Description           |
+|----------------|-----------------------------------------|-----------------------|
+| apache2restart | `sudo /path/to/apache2.wrapper restart` | Restart apache daemon |
+| apache2start   | `sudo /path/to/apache2.wrapper start`   | Start apache daemon   |
+| apache2stop    | `sudo /path/to/apache2.wrapper stop`    | Stop apache daemon    |

-### CONTRIBUTORS
- - Alexander Rinass (alex@rinass.net)
+## Contributors

---
+- Alexander Rinass (alex@rinass.net)
@@ -1,5 +1,41 @@
 ## arcanist

-**Maintainer:** [@emzar](https://github.com/emzar)
-
 This plugin adds many useful aliases for [arcanist](https://github.com/phacility/arcanist).
+
+To use it, add `arcanist` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... arcanist)
+```
+
+## Aliases
+
+| Alias   | Command                            |
+| ------- | ---------------------------------- |
+| ara     | `arc amend`                        |
+| arb     | `arc branch`                       |
+| arco    | `arc cover`                        |
+| arci    | `arc commit`                       |
+| ard     | `arc diff`                         |
+| ardc    | `arc diff --create`                |
+| ardp    | `arc diff --preview`               |
+| ardnu   | `arc diff --nounit`                |
+| ardnupc | `arc diff --nounit --plan-changes` |
+| ardpc   | `arc diff --plan-changes`          |
+| are     | `arc export`                       |
+| arh     | `arc help`                         |
+| arl     | `arc land`                         |
+| arli    | `arc lint`                         |
+| arls    | `arc list`                         |
+| arpa    | `arc patch`                        |
+
+## Functions
+
+The following functions make copy pasting revision ids from the URL bar of your browser
+easier, as they allow for copy pasting the whole URL. For example: `ardu` accepts
+both `https://arcanist-url.com/<REVISION>` as well as `<REVISION>`.
+
+| Function                  | Command                           |
+| ------------------------- | --------------------------------- |
+| ardu [URL or revision_id] | `arc diff --update` [revision_id] |
+| arpa [URL or revision_id] | `arc patch` [revision_id]         |
@@ -9,13 +9,29 @@ alias arco='arc cover'
 alias arci='arc commit'

 alias ard='arc diff'
+alias ardc='arc diff --create'
 alias ardnu='arc diff --nounit'
 alias ardnupc='arc diff --nounit --plan-changes'
 alias ardpc='arc diff --plan-changes'
+alias ardp='arc diff --preview' # creates a new diff in the phab interface

 alias are='arc export'
 alias arh='arc help'
 alias arl='arc land'
 alias arli='arc lint'
 alias arls='arc list'
-alias arpa='arc patch'
+
+#
+# Functions
+# (sorted alphabetically)
+#
+
+ardu() {
+  # Both `ardu https://arcanist-url.com/<REVISION>`, and `ardu <REVISION>` work.
+  arc diff --update "${1:t}"
+}
+
+arpa() {
+  # Both `arpa https://arcanist-url.com/<REVISION>`, and `arpa <REVISION>` work.
+  arc patch "${1:t}"
+}
@@ -1,5 +1,13 @@
 # Archlinux plugin

+This plugin adds some aliases and functions to work with Arch Linux.
+
+To use it, add `archlinux` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... archlinux)
+```
+
 ## Features

 #### YAY
@@ -119,7 +127,7 @@
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
-| pacfiles     | pacman -Fs                              | Search package file names for matching strings               |
+| pacfiles     | pacman -F                               | Search package file names for matching strings               |
 | pacls        | pacman -Ql                              | List files in a package                                      |
 | pacown       | pacman -Qo                              | Show which package owns a file                               |

@@ -149,7 +149,7 @@ alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
-alias pacfiles='pacman -Fs'
+alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'

@@ -7,8 +7,14 @@ To use it, add `autoenv` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... autoenv)
 ```
+
+## Functions
+
+* `use_env()`: creates and/or activates a virtualenv. For use in `.env` files.
+  See the source code for details.
+
 ## Requirements

 In order to make this work, you will need to have the autoenv installed.

-More info on the usage and install: https://github.com/inishchith/autoenv
+More info on the usage and install at [the project's homepage](https://github.com/inishchith/autoenv).
@@ -1,12 +1,39 @@
-# Activates autoenv or reports its failure
+# Initialization: activate autoenv or report its absence
 () {
+local d autoenv_dir install_locations
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do
+  # Check if activate.sh is in $PATH
+  if (( $+commands[activate.sh] )); then
+    autoenv_dir="${commands[activate.sh]:h}"
+  fi
+
+  # Locate autoenv installation
+  if [[ -z $autoenv_dir ]]; then
+    install_locations=(
+      ~/.autoenv
+      ~/.local/bin
+      /usr/local/opt/autoenv
+      /usr/local/bin
+      /usr/share/autoenv-git
+      ~/Library/Python/bin
+    )
+    for d ( $install_locations ); do
+      if [[ -e $d/activate.sh ]]; then
+        autoenv_dir=$d
+        break
+      fi
+    done
+  fi
+
+  # Look for Homebrew path as a last resort
+  if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then
+    d=$(brew --prefix)/opt/autoenv
    if [[ -e $d/activate.sh ]]; then
      autoenv_dir=$d
-      break
    fi
-  done
+  fi
+
+  # Complain if autoenv is not installed
  if [[ -z $autoenv_dir ]]; then 
    cat <<END >&2
 -------- AUTOENV ---------
@@ -17,6 +44,7 @@ In the meantime the autoenv plugin is DISABLED.
 END
    return 1
  fi
+  # Load autoenv
  source $autoenv_dir/activate.sh
 fi
 }
@@ -27,17 +55,17 @@ fi
 # It only performs an action if the requested virtualenv is not the current one.

 use_env() {
-    typeset venv
-    venv="$1"
-    if [[ "${VIRTUAL_ENV:t}" != "$venv" ]]; then
-        if workon | grep -q "$venv"; then
-            workon "$venv"
-        else
-            echo -n "Create virtualenv $venv now? (Yn) "
-            read answer
-            if [[ "$answer" == "Y" ]]; then
-                mkvirtualenv "$venv"
-            fi
-        fi
+  local venv
+  venv="$1"
+  if [[ "${VIRTUAL_ENV:t}" != "$venv" ]]; then
+    if workon | grep -q "$venv"; then
+      workon "$venv"
+    else
+      echo -n "Create virtualenv $venv now? (Yn) "
+      read answer
+      if [[ "$answer" == "Y" ]]; then
+        mkvirtualenv "$venv"
+      fi
    fi
+  fi
 }
@@ -10,7 +10,8 @@ function asp() {
    return
  fi

-  local available_profiles=($(aws_profiles))
+  local -a available_profiles
+  available_profiles=($(aws_profiles))
  if [[ -z "${available_profiles[(r)$1]}" ]]; then
    echo "${fg[red]}Profile '$1' not found in '${AWS_CONFIG_FILE:-$HOME/.aws/config}'" >&2
    echo "Available profiles: ${(j:, :)available_profiles:-no profiles found}${reset_color}" >&2
@@ -61,36 +62,45 @@ fi

 # Load awscli completions

-function _awscli-homebrew-installed() {
-  # check if Homebrew is installed
-  (( $+commands[brew] )) || return 1
+# AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
+if [[ -x /usr/local/bin/aws_completer ]]; then
+  autoload -Uz bashcompinit && bashcompinit
+  complete -C aws_completer aws
+else
+  function _awscli-homebrew-installed() {
+    # check if Homebrew is installed
+    (( $+commands[brew] )) || return 1

-  # speculatively check default brew prefix
-  if [ -h /usr/local/opt/awscli ]; then
-    _brew_prefix=/usr/local/opt/awscli
-  else
-    # ok, it is not in the default prefix
-    # this call to brew is expensive (about 400 ms), so at least let's make it only once
-    _brew_prefix=$(brew --prefix awscli)
+    # speculatively check default brew prefix
+    if [ -h /usr/local/opt/awscli ]; then
+      _brew_prefix=/usr/local/opt/awscli
+    else
+      # ok, it is not in the default prefix
+      # this call to brew is expensive (about 400 ms), so at least let's make it only once
+      _brew_prefix=$(brew --prefix awscli)
+    fi
+  }
+
+  # get aws_zsh_completer.sh location from $PATH
+  _aws_zsh_completer_path="$commands[aws_zsh_completer.sh]"
+
+  # otherwise check common locations
+  if [[ -z $_aws_zsh_completer_path ]]; then
+    # Homebrew
+    if _awscli-homebrew-installed; then
+      _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
+    # Ubuntu
+    elif [[ -e /usr/share/zsh/vendor-completions/_awscli ]]; then
+      _aws_zsh_completer_path=/usr/share/zsh/vendor-completions/_awscli
+    # NixOS
+    elif [[ -e "${commands[aws]:P:h:h}/share/zsh/site-functions/aws_zsh_completer.sh" ]]; then
+      _aws_zsh_completer_path="${commands[aws]:P:h:h}/share/zsh/site-functions/aws_zsh_completer.sh"
+    # RPM
+    else
+      _aws_zsh_completer_path=/usr/share/zsh/site-functions/aws_zsh_completer.sh
+    fi
  fi
-}

-# get aws_zsh_completer.sh location from $PATH
-_aws_zsh_completer_path="$commands[aws_zsh_completer.sh]"
-
-# otherwise check common locations
-if [[ -z $_aws_zsh_completer_path ]]; then
-  # Homebrew
-  if _awscli-homebrew-installed; then
-    _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
-  # Ubuntu
-  elif [[ -e /usr/share/zsh/vendor-completions/_awscli ]]; then
-    _aws_zsh_completer_path=/usr/share/zsh/vendor-completions/_awscli
-  # RPM
-  else
-    _aws_zsh_completer_path=/usr/share/zsh/site-functions/aws_zsh_completer.sh
-  fi
+  [[ -r $_aws_zsh_completer_path ]] && source $_aws_zsh_completer_path
+  unset _aws_zsh_completer_path _brew_prefix
 fi
-
-[[ -r $_aws_zsh_completer_path ]] && source $_aws_zsh_completer_path
-unset _aws_zsh_completer_path _brew_prefix
@@ -11,22 +11,21 @@
 # Modified to add support for FreeBSD     #
 ###########################################

-if [[ "$OSTYPE" = darwin* ]] ; then
+if [[ "$OSTYPE" = darwin* ]]; then

-  function battery_pct() {
-    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
-    typeset -F maxcapacity=$(echo $smart_battery_status | grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
-    typeset -F currentcapacity=$(echo $smart_battery_status | grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
-    integer i=$(((currentcapacity/maxcapacity) * 100))
-    echo $i
+  function battery_is_charging() {
+    ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
  }

-  function plugged_in() {
-    [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
+  function battery_pct() {
+    local battery_status="$(ioreg -rc AppleSmartBattery)"
+    local -i capacity=$(sed -n -e '/MaxCapacity/s/^.*"MaxCapacity"\ =\ //p' <<< $battery_status)
+    local -i current=$(sed -n -e '/CurrentCapacity/s/^.*"CurrentCapacity"\ =\ //p' <<< $battery_status)
+    echo $(( current * 100 / capacity ))
  }

  function battery_pct_remaining() {
-    if plugged_in ; then
+    if battery_is_charging; then
      echo "External Power"
    else
      battery_pct
@@ -35,9 +34,9 @@ if [[ "$OSTYPE" = darwin* ]] ; then

  function battery_time_remaining() {
    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
-    if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
-      if [ $timeremaining -gt 720 ] ; then
+    if [[ $(echo $smart_battery_status | command grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]]; then
+      timeremaining=$(echo $smart_battery_status | command grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
+      if [ $timeremaining -gt 720 ]; then
        echo "::"
      else
        echo "~$((timeremaining / 60)):$((timeremaining % 60))"
@@ -48,39 +47,36 @@ if [[ "$OSTYPE" = darwin* ]] ; then
  }

  function battery_pct_prompt () {
-    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      b=$(battery_pct_remaining)
-      if [ $b -gt 50 ] ; then
+    local battery_pct color
+    if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
+      battery_pct=$(battery_pct_remaining)
+      if [[ $battery_pct -gt 50 ]]; then
        color='green'
-      elif [ $b -gt 20 ] ; then
+      elif [[ $battery_pct -gt 20 ]]; then
        color='yellow'
      else
        color='red'
      fi
-      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+      echo "%{$fg[$color]%}[${battery_pct}%%]%{$reset_color%}"
    else
      echo "∞"
    fi
  }

-  function battery_is_charging() {
-    [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
-  }
-
-elif [[ "$OSTYPE" = freebsd*  ]] ; then
+elif [[ "$OSTYPE" = freebsd* ]]; then

  function battery_is_charging() {
    [[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
  }

  function battery_pct() {
-    if (( $+commands[sysctl] )) ; then
-      echo "$(sysctl -n hw.acpi.battery.life)"
+    if (( $+commands[sysctl] )); then
+      sysctl -n hw.acpi.battery.life
    fi
  }

  function battery_pct_remaining() {
-    if [ ! $(battery_is_charging) ] ; then
+    if ! battery_is_charging; then
      battery_pct
    else
      echo "External Power"
@@ -88,45 +84,46 @@ elif [[ "$OSTYPE" = freebsd*  ]] ; then
  }

  function battery_time_remaining() {
+    local remaining_time
    remaining_time=$(sysctl -n hw.acpi.battery.time)
-    if [[ $remaining_time -ge 0 ]] ; then
-      # calculation from https://www.unix.com/shell-programming-and-scripting/23695-convert-minutes-hours-minutes-seconds.html
-      ((hour=$remaining_time/60))
-      ((minute=$remaining_time-$hour*60))
-      echo $hour:$minute
+    if [[ $remaining_time -ge 0 ]]; then
+      ((hour = $remaining_time / 60 ))
+      ((minute = $remaining_time % 60 ))
+      printf %02d:%02d $hour $minute
    fi
  }

  function battery_pct_prompt() {
-    b=$(battery_pct_remaining)
-    if [ ! $(battery_is_charging) ] ; then
-      if [ $b -gt 50 ] ; then
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
        color='green'
-      elif [ $b -gt 20 ] ; then
+      elif [[ $battery_pct -gt 20 ]]; then
        color='yellow'
      else
        color='red'
      fi
-      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
-    else
-      echo "∞"
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
    fi
  }

-elif [[ "$OSTYPE" = linux*  ]] ; then
+elif [[ "$OSTYPE" = linux*  ]]; then

  function battery_is_charging() {
-    ! [[ $(acpi 2>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]]
+    ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
  }

  function battery_pct() {
-    if (( $+commands[acpi] )) ; then
-      echo "$(acpi 2>/dev/null | cut -f2 -d ',' | tr -cd '[:digit:]')"
+    if (( $+commands[acpi] )); then
+      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Full|(Disc|C)harging)' | cut -f2 -d ',' | tr -cd '[:digit:]'
    fi
  }

  function battery_pct_remaining() {
-    if [ ! $(battery_is_charging) ] ; then
+    if ! battery_is_charging; then
      battery_pct
    else
      echo "External Power"
@@ -134,76 +131,81 @@ elif [[ "$OSTYPE" = linux*  ]] ; then
  }

  function battery_time_remaining() {
-    if [[ $(acpi 2>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-      echo $(acpi 2>/dev/null | cut -f3 -d ',')
+    if ! battery_is_charging; then
+      acpi 2>/dev/null | command grep -v "rate information unavailable" | cut -f3 -d ','
    fi
  }

  function battery_pct_prompt() {
-    b=$(battery_pct_remaining) 
-    if [[ $(acpi 2>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-      if [ $b -gt 50 ] ; then
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
        color='green'
-      elif [ $b -gt 20 ] ; then
+      elif [[ $battery_pct -gt 20 ]]; then
        color='yellow'
      else
        color='red'
      fi
-      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
-    else
-      echo "∞"
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
    fi
  }

 else
  # Empty functions so we don't cause errors in prompts
-  function battery_pct_remaining() {
-  }
-
-  function battery_time_remaining() {
-  }
-
-  function battery_pct_prompt() {
-  }
+  function battery_is_charging { false }
+  function battery_pct \
+    battery_pct_remaining \
+    battery_time_remaining \
+    battery_pct_prompt { }
 fi

 function battery_level_gauge() {
-  local gauge_slots=${BATTERY_GAUGE_SLOTS:-10};
-  local green_threshold=${BATTERY_GREEN_THRESHOLD:-6};
-  local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-4};
-  local color_green=${BATTERY_COLOR_GREEN:-%F{green}};
-  local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}};
-  local color_red=${BATTERY_COLOR_RED:-%F{red}};
-  local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}};
-  local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['};
-  local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'};
-  local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'};
-  local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'};
-  local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow};
-  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'};
+  local gauge_slots=${BATTERY_GAUGE_SLOTS:-10}
+  local green_threshold=${BATTERY_GREEN_THRESHOLD:-$(( gauge_slots * 0.6 ))}
+  local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-$(( gauge_slots * 0.4 ))}
+  local color_green=${BATTERY_COLOR_GREEN:-%F{green}}
+  local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}}
+  local color_red=${BATTERY_COLOR_RED:-%F{red}}
+  local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}}
+  local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['}
+  local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'}
+  local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'}
+  local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'}
+  local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}

-  local battery_remaining_percentage=$(battery_pct);
+  local battery_remaining_percentage=$(battery_pct)
+  local filled empty gauge_color

  if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
-    local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots)));
-    local empty=$(($gauge_slots - $filled));
+    filled=$(( ($battery_remaining_percentage * $gauge_slots) / 100 ))
+    empty=$(( $gauge_slots - $filled ))

-    if [[ $filled -gt $green_threshold ]]; then local gauge_color=$color_green;
-    elif [[ $filled -gt $yellow_threshold ]]; then local gauge_color=$color_yellow;
-    else local gauge_color=$color_red;
+    if [[ $filled -gt $green_threshold ]]; then
+      gauge_color=$color_green
+    elif [[ $filled -gt $yellow_threshold ]]; then
+      gauge_color=$color_yellow
+    else
+      gauge_color=$color_red
    fi
  else
-    local filled=$gauge_slots;
-    local empty=0;
-    filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
+    filled=$gauge_slots
+    empty=0
+    filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'}
  fi

-  local charging=' ' && battery_is_charging && charging=$charging_symbol;
+  local charging=' '
+  battery_is_charging && charging=$charging_symbol

-  printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
-  printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled}
+  # Charging status and prefix
+  print -n ${charging_color}${charging}${color_reset}${battery_prefix}${gauge_color}
+  # Filled slots
+  [[ $filled -gt 0 ]] && printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled}
+  # Empty slots
  [[ $filled -lt $gauge_slots ]] && printf ${empty_symbol//\%/\%\%}'%.0s' {1..$empty}
-  printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
+  # Suffix
+  print -n ${color_reset}${battery_suffix}${color_reset}
 }
-
-
@@ -4,7 +4,7 @@ This plugin adds completion for [Bower](https://bower.io/) and a few useful alia

 To use it, add `bower` to the plugins array in your zshrc file:

-```
+```zsh
 plugins=(... bower)
 ```

@@ -15,4 +15,3 @@ plugins=(... bower)
 | bi    | `bower install` | Installs the project dependencies listed in bower.json |
 | bl    | `bower list`    | List local packages and possible updates               |
 | bs    | `bower search`  | Finds all packages or a specific package.              |
-
@@ -2,28 +2,16 @@

 Plugin for displaying images on the terminal using the the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)

+To use it, add `catimg` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... catimg)
+```
+
 ## Requirements

 - `convert` (ImageMagick)

-## Enabling the plugin
-
-1. Open your `.zshrc` file and add `catimg` in the plugins section:
-
-   ```zsh
-   plugins=(
-       # all your enabled plugins
-       catimg
-   )
-   ```
-
-2. Restart the shell or restart your Terminal session:
-
-   ```console
-   $ exec zsh
-   $
-   ```
-
 ## Functions

 | Function | Description                              |
@@ -1,6 +1,6 @@
 # chucknorris

-Chuck Norris fortunes plugin for oh-my-zsh
+Chuck Norris fortunes plugin for oh-my-zsh. Perfectly suitable as MOTD.

 **Maintainers**: [apjanke](https://github.com/apjanke) [maff](https://github.com/maff)

@@ -10,11 +10,31 @@ To use it add `chucknorris` to the plugins array in you zshrc file.
 plugins=(... chucknorris)
 ```

-
-Depends on fortune (and cowsay if using chuck_cow) being installed (available via homebrew, apt, ...). Perfectly suitable as MOTD.
-
+## Usage

 | Command     | Description                     |
 | ----------- | ------------------------------- |
 | `chuck`     | Print random Chuck Norris quote |
 | `chuck_cow` | Print quote in cowthink         |
+
+Example: output of `chuck_cow`:
+
+```
+Last login: Fri Jan 30 23:12:26 on ttys001
+ ______________________________________
+( When Chuck Norris plays Monopoly, it )
+( affects the actual world economy.    )
+ --------------------------------------
+        o   ^__^
+         o  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
+```
+
+## Requirements
+
+- `fortune`
+- `cowsay` if using `chuck_cow`
+
+Available via homebrew, apt, ...
@@ -4,8 +4,8 @@

 To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:

-```
-plugins=(... dash)
+```zsh
+plugins=(... cloudapp)
 ```

 ## Requirements
@@ -1,4 +1,4 @@
-## Coffeescript Plugin
+# Coffeescript Plugin

 This plugin provides aliases for quickly compiling and previewing your
 coffeescript code.
@@ -8,6 +8,9 @@ To use it, add `colored-man-pages` to the plugins array in your zshrc file:
 plugins=(... colored-man-pages)
 ```

+It will also automatically colorize man pages displayed by `dman` or `debman`,
+from [`debian-goodies`](https://packages.debian.org/stable/debian-goodies).
+
 You can also try to color other pages by prefixing the respective command with `colored`:

 ```zsh
@@ -31,6 +31,9 @@ function colored() {
 			"$@"
 }

-function man() {
-	colored man "$@"
+# Colorize man and dman/debman (from debian-goodies)
+function man \
+	dman \
+	debman {
+	colored $0 "$@"
 }
@@ -26,10 +26,8 @@ fi

 # OSX command-not-found support
 # https://github.com/Homebrew/homebrew-command-not-found
-if type brew &> /dev/null; then
-  if brew command command-not-found-init > /dev/null 2>&1; then
-    eval "$(brew command-not-found-init)";
-  fi
+if [[ -s '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh' ]]; then
+    source '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh'
 fi

 # NixOS command-not-found support
@@ -50,6 +50,7 @@ alias mv='mv -i'

 # zsh is able to auto-do some kungfoo
 # depends on the SUFFIX :)
+autoload -Uz is-at-least
 if is-at-least 4.2.0; then
  # open browser on urls
  if [[ -n "$BROWSER" ]]; then
@@ -3,6 +3,7 @@
 This plugin looks for [compleat](https://github.com/mbrubeck/compleat) and loads its completion.

 To use it, add compleat to the plugins array in your zshrc file:
-```
+
+```zsh
 plugins=(... compleat)
 ```
@@ -12,18 +12,18 @@ plugins=(... composer)

 ## Aliases

-| Alias  | Command                                      | Description                                                                            |
-| ------ | -------------------------------------------- | -------------------------------------------------------------------------------------- |
-| `c`    | composer                                     | Starts composer                                                                        |
-| `csu`  | composer self-update                         | Updates composer to the latest version                                                 |
-| `cu`   | composer update                              | Updates composer dependencies and `composer.lock` file                                 |
-| `cr`   | composer require                             | Adds new packages to `composer.json`                                                   |
-| `crm`  | composer remove                              | Removes packages from `composer.json`                                                  |
-| `ci`   | composer install                             | Resolves and installs dependencies from `composer.json`                                |
-| `ccp`  | composer create-project                      | Create new project from an existing package                                            |
-| `cdu`  | composer dump-autoload                       | Updates the autoloader                                                                 |
-| `cdo`  | composer dump-autoload --optimize-autoloader | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production) |
-| `cgu`  | composer global update                       | Allows update command to run on COMPOSER_HOME directory                                |
-| `cgr`  | composer global require                      | Allows require command to run on COMPOSER_HOME directory                               |
-| `cgrm` | composer global remove                       | Allows remove command to run on COMPOSER_HOME directory                                |
-| `cget` | `curl -s https://getcomposer.org/installer`  | Installs composer in the current directory                                             |
+| Alias  | Command                                        | Description                                                                            |
+| ------ | ---------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `c`    | `composer`                                     | Starts composer                                                                        |
+| `csu`  | `composer self-update`                         | Updates composer to the latest version                                                 |
+| `cu`   | `composer update`                              | Updates composer dependencies and `composer.lock` file                                 |
+| `cr`   | `composer require`                             | Adds new packages to `composer.json`                                                   |
+| `crm`  | `composer remove`                              | Removes packages from `composer.json`                                                  |
+| `ci`   | `composer install`                             | Resolves and installs dependencies from `composer.json`                                |
+| `ccp`  | `composer create-project`                      | Create new project from an existing package                                            |
+| `cdu`  | `composer dump-autoload`                       | Updates the autoloader                                                                 |
+| `cdo`  | `composer dump-autoload --optimize-autoloader` | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production) |
+| `cgu`  | `composer global update`                       | Allows update command to run on COMPOSER_HOME directory                                |
+| `cgr`  | `composer global require`                      | Allows require command to run on COMPOSER_HOME directory                               |
+| `cgrm` | `composer global remove`                       | Allows remove command to run on COMPOSER_HOME directory                                |
+| `cget` | `curl -s https://getcomposer.org/installer`    | Installs composer in the current directory                                             |
@@ -15,20 +15,16 @@ _composer_get_required_list () {
 }

 _composer () {
-  local curcontext="$curcontext" state line
-  typeset -A opt_args
-  _arguments \
-    '1: :->command'\
-    '*: :->args'
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+    _arguments \
+        '*:: :->subcmds'

-  case $state in
-    command)
-      compadd $(_composer_get_command_list)
-      ;;
-    *)
-      compadd $(_composer_get_required_list)
-      ;;
-  esac
+    if (( CURRENT == 1 )) || ( ((CURRENT == 2)) && [ "$words[1]" = "global" ] ) ; then
+        compadd $(_composer_get_command_list)
+    else
+        compadd $(_composer_get_required_list)
+    fi
 }

 compdef _composer composer
@@ -43,7 +39,7 @@ alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
-alias cdo='composer dump-autoload --optimize-autoloader'
+alias cdo='composer dump-autoload -o'
 alias cgu='composer global update'
 alias cgr='composer global require'
 alias cgrm='composer global remove'
@@ -1,9 +1,9 @@
 # copy the active line from the command line buffer 
-# onto the system clipboard (requires clipcopy plugin)
+# onto the system clipboard

 copybuffer () {
  if which clipcopy &>/dev/null; then
-    echo $BUFFER | clipcopy
+    printf "%s" "$BUFFER" | clipcopy
  else
    echo "clipcopy function not found. Please make sure you have Oh My Zsh installed correctly."
  fi
@@ -3,7 +3,8 @@
 Puts the contents of a file in your system clipboard so you can paste it anywhere.

 To use, add `copyfile` to your plugins array:
-```
+
+```zsh
 plugins=(... copyfile)
 ```

@@ -4,6 +4,6 @@ This plugin provides completion for [Cpanm](https://github.com/miyagawa/cpanminu

 To use it add cpanm to the plugins array in your zshrc file.

- ```bash
+```zsh
 plugins=(... cpanm)
 ```
@@ -7,6 +7,7 @@ To use it, add `dirhistory` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... dirhistory)
 ```
+
 ## Keyboard Shortcuts

 | Shortcut                          | Description                                               |
@@ -15,3 +16,24 @@ plugins=(... dirhistory)
 | <kbd>alt</kbd> + <kbd>right</kbd> | Undo <kbd>alt</kbd> + <kbd>left</kbd>                     |
 | <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
 | <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
+
+## Usage
+
+This plugin allows you to navigate the history of previous current-working-directories using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. MAC users may alternately use OPT-LEFT and OPT-RIGHT.
+
+Also, navigate directory **hierarchy** using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented). ALT-UP moves to higher hierarchy (shortcut for 'cd ..'). ALT-DOWN moves into the first directory found in alphabetical order (useful to navigate long empty directories e.g. java packages)
+
+For example, if the shell was started, and the following commands were entered:
+
+```shell
+cd ~
+cd /usr
+cd share
+cd doc
+```
+
+Then entering ALT-LEFT at the prompt would change directory from /usr/share/doc to /usr/share, then if pressed again to /usr/, then ~. If ALT-RIGHT were pressed the directory would be changed to /usr/ again.
+
+After that, ALT-DOWN will probably go to /usr/bin (depends on your /usr structure), ALT-UP will return to /usr, then ALT-UP will get you to /
+
+**Currently the max history size is 30**. The navigation should work for xterm, PuTTY xterm mode, GNU screen, and on MAC with alternate keys as mentioned above.
@@ -1,6 +1,7 @@
 # Dirpersist plugin

-This plugin keeps a running tally of the previous 20 unique directories in the $HOME/.zdirs file.  When you cd to a new directory, it is prepended to the beginning of the file.
+This plugin keeps a running tally of the previous 20 unique directories in the `$HOME/.zdirs` file.
+When you cd to a new directory, it is prepended to the beginning of the file.

 To use it, add `dirpersist` to the plugins array in your zshrc file:

@@ -34,23 +34,3 @@ runfcgi                    -- run this project as a fastcgi
 runserver                  -- start a lightweight web server for development
 ...
 ```
-
-If you want to see the options available for a specific command, try:
-
-```zsh
-$> python manage.py makemessages (press <TAB> here)
-```
-
-And that would result in:
-
-```zsh
--all         -a  -- re-examine all code and templates
--domain      -d  -- domain of the message files (default: "django")
--extensions  -e  -- file extension(s) to examine (default: ".html")
--help            -- display help information
--locale      -l  -- locale to process (default: all)
--pythonpath      -- directory to add to the Python path
--settings        -- python path to settings module
-...
-```
-
@@ -1,10 +1,14 @@
-## Description
+# dnf plugin

-This plugin makes `dnf` usage easier by adding aliases for the most
-common commands.
+This plugin makes `dnf` usage easier by adding aliases for the most common commands.

-`dnf` is the new package manager for RPM-based distributions, which
-replaces `yum`.
+`dnf` is the new package manager for RPM-based distributions, which replaces `yum`.
+
+To use it, add `dnf` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... dnf)
+```

 ## Aliases

@@ -4,7 +4,8 @@ This plugin provides completion for [docker-compose](https://docs.docker.com/com
 aliases for frequent docker-compose commands.

 To use it, add docker-compose to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... docker-compose)
 ```

@@ -3,6 +3,7 @@
 This plugin adds auto-completion for [docker](https://www.docker.com/).

 To use it add `docker` to the plugins array in your zshrc file.
+
 ```zsh
 plugins=(... docker)
 ```
@@ -4,9 +4,7 @@ Automatically load your project ENV variables from `.env` file when you `cd` int

 Storing configuration in the environment is one of the tenets of a [twelve-factor app](https://www.12factor.net). Anything that is likely to change between deployment environments, such as resource handles for databases or credentials for external services, should be extracted from the code into environment variables.

-## Installation
-
-Just add the plugin to your `.zshrc`:
+To use it, add `dotenv` to the plugins array in your zshrc file:

 ```sh
 plugins=(... dotenv)
@@ -17,32 +15,63 @@ plugins=(... dotenv)
 Create `.env` file inside your project root directory and put your ENV variables there.

 For example:
+
 ```sh
 export AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
 export SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
 export MONGO_URI=mongodb://127.0.0.1:27017
 export PORT=3001
 ```
+
 `export` is optional. This format works as well:
+
 ```sh
 AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
 SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
 MONGO_URI=mongodb://127.0.0.1:27017
 PORT=3001
 ```
+
 You can even mix both formats, although it's probably a bad idea.

+## Settings
+
 ### ZSH_DOTENV_FILE

 You can also modify the name of the file to be loaded with the variable `ZSH_DOTENV_FILE`.
 If the variable isn't set, the plugin will default to use `.env`.
 For example, this will make the plugin look for files named `.dotenv` and load them:

-```
+```zsh
 # in ~/.zshrc, before Oh My Zsh is sourced:
 ZSH_DOTENV_FILE=.dotenv
 ```

+### ZSH_DOTENV_PROMPT
+
+Set `ZSH_DOTENV_PROMPT=false` in your zshrc file if you don't want the confirmation message.
+You can also choose the `Always` option when prompted to always allow sourcing the .env file
+in that directory. See the next section for more details.
+
+### ZSH_DOTENV_ALLOWED_LIST
+
+The default behavior of the plugin is to always ask whether to source a dotenv file. There's
+a **Y**es, **N**o, and **A**lways option. If you choose Always, the directory of the .env file
+will be added to an allowed list. If a directory is found in this list, the plugin won't ask
+for confirmation and will instead source the .env file directly.
+
+This allowed list is saved by default in `$ZSH_CACHE_DIR/dotenv-allowed.list`. If you want
+to change that location, change the `$ZSH_DOTENV_ALLOWED_LIST` variable, like so:
+
+```zsh
+# in ~/.zshrc, before Oh My Zsh is sourced:
+ZSH_DOTENV_ALLOWED_LIST=/path/to/dotenv/allowed/list
+```
+
+This file is just a list of directories allowed, separated by a newline character. If you want
+to disallow a directory, just edit this file and remove the line for the directory you want to
+disallow.
+
 ## Version Control

 **It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it's supposed to be local only.
@@ -52,5 +81,6 @@ ZSH_DOTENV_FILE=.dotenv
 This plugin only sources the `.env` file. Nothing less, nothing more. It doesn't do any checks. It's designed to be the fastest and simplest option. You're responsible for the `.env` file content. You can put some code (or weird symbols) there, but do it on your own risk. `dotenv` is the basic tool, yet it does the job.

 If you need more advanced and feature-rich ENV management, check out these awesome projects:
+
 * [direnv](https://github.com/direnv/direnv)
 * [zsh-autoenv](https://github.com/Tarrasch/zsh-autoenv)
@@ -1,23 +1,46 @@
+## Settings
+
+# Filename of the dotenv file to look for
+: ${ZSH_DOTENV_FILE:=.env}
+
+# Path to the file containing allowed paths
+: ${ZSH_DOTENV_ALLOWED_LIST:="${ZSH_CACHE_DIR:-$ZSH/cache}/dotenv-allowed.list"}
+
+
+## Functions
+
 source_env() {
  if [[ -f $ZSH_DOTENV_FILE ]]; then
+    if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
+      local confirmation dirpath="${PWD:A}"
+
+      # make sure there is an allowed file
+      touch "$ZSH_DOTENV_ALLOWED_LIST"
+
+      # check if current directory's .env file is allowed or ask for confirmation
+      if ! grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+        # print same-line prompt and output newline character if necessary
+        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways) "
+        read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
+
+        # check input
+        case "$confirmation" in
+          [nN]) return ;;
+          [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
+          *) ;; # interpret anything else as a yes
+        esac
+      fi
+    fi
+
    # test .env syntax
    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2

-    if [[ -o a ]]; then
-      source $ZSH_DOTENV_FILE
-    else
-      set -a
-      source $ZSH_DOTENV_FILE
-      set +a
-    fi
+    setopt localoptions allexport
+    source $ZSH_DOTENV_FILE
  fi
 }

 autoload -U add-zsh-hook
 add-zsh-hook chpwd source_env

-if [[ -z $ZSH_DOTENV_FILE ]]; then
-    ZSH_DOTENV_FILE=.env
-fi
-
 source_env
@@ -10,12 +10,14 @@ plugins=(... dotnet)

 ## Aliases

-| Alias | Command      | Description                                                       |
-|-------|--------------|-------------------------------------------------------------------|
-| dn    | dotnet new   | Create a new .NET project or file.                                |
-| dr    | dotnet run   | Build and run a .NET project output.                              |
-| dt    | dotnet test  | Run unit tests using the test runner specified in a .NET project. |
-| ds    | dotnet sln   | Modify Visual Studio solution files.                              |
-| da    | dotnet add   | Add a package or reference to a .NET project.                     |
-| dp    | dotnet pack  | Create a NuGet package.                                           |
-| dng   | dotnet nuget | Provides additional NuGet commands.                               |
+| Alias | Command          | Description                                                       |
+|-------|------------------|-------------------------------------------------------------------|
+| dn    | dotnet new       | Create a new .NET project or file.                                |
+| dr    | dotnet run       | Build and run a .NET project output.                              |
+| dt    | dotnet test      | Run unit tests using the test runner specified in a .NET project. |
+| dw    | dotnet watch     | Watch for source file changes and restart the dotnet command.     |
+| dwr   | dotnet watch run | Watch for source file changes and restart the `run` command.      |
+| ds    | dotnet sln       | Modify Visual Studio solution files.                              |
+| da    | dotnet add       | Add a package or reference to a .NET project.                     |
+| dp    | dotnet pack      | Create a NuGet package.                                           |
+| dng   | dotnet nuget     | Provides additional NuGet commands.                               |
@@ -1,116 +1,31 @@
-# --------------------------------------------------------------------- #
-# Aliases and Completions for .NET Core (https://dotnet.microsoft.com/) #
-# Author: Shaun Tabone (https://github.com/xontab)                      #
-# --------------------------------------------------------------------- #
+# This scripts is copied from (MIT License):
+# https://github.com/dotnet/toolset/blob/master/scripts/register-completions.zsh

-# Helper function to cache and load completions
-local cache_base_path="${ZSH_CACHE_DIR}/dotnet_"
-_dotnet_cache_completion() {
-    local cache="${cache_base_path}$(echo $1)_completion"
-    if [[ ! -f $cache ]]; then
-        $2 $cache
-    fi
+_dotnet_zsh_complete() 
+{
+  local completions=("$(dotnet complete "$words")")

-    [[ -f $cache ]] && cat $cache
+  # If the completion list is empty, just continue with filename selection
+  if [ -z "$completions" ]
+  then
+    _arguments '*::arguments: _normal'
+    return
+  fi
+
+  # This is not a variable assigment, don't remove spaces!
+  _values = "${(ps:\n:)completions}"
 }

-_dotnet_cache_completion_cleanup() {
-    local cache="${cache_base_path}$(echo $1)_completion"
-    rm -f $cache
-}
+compdef _dotnet_zsh_complete dotnet

-# --------------------------------------------------------------------- #
-# dotnet new                                                            #
-# ALIAS: dn                                                             #
-# --------------------------------------------------------------------- #
-_dotnet_new_completion() {
-    if [ $commands[dotnet] ]; then
-        dotnet new -l | tail -n +21 | sed 's/  \+/:/g' | cut -d : -f 2 >$1
-    fi
-}
-
-_dotnet_new_completion_cached() {
-    _dotnet_cache_completion 'new' _dotnet_new_completion
-}
-
-_dotnet_cache_completion_cleanup 'new'
+# Aliases bellow are here for backwards compatibility
+# added by Shaun Tabone (https://github.com/xontab) 

 alias dn='dotnet new'
-
-# --------------------------------------------------------------------- #
-# dotnet                                                                #
-# --------------------------------------------------------------------- #
-_dotnet() {
-    if [ $CURRENT -eq 2 ]; then
-        _arguments \
-            '--diagnostics[Enable diagnostic output.]' \
-            '--help[Show command line help.]' \
-            '--info[Display .NET Core information.]' \
-            '--list-runtimes[Display the installed runtimes.]' \
-            '--list-sdks[Display the installed SDKs.]' \
-            '--version[Display .NET Core SDK version in use.]'
-
-        _values \
-            'add[Add a package or reference to a .NET project.]' \
-            'build[Build a .NET project.]' \
-            'build-server[Interact with servers started by a build.]' \
-            'clean[Clean build outputs of a .NET project.]' \
-            'help[Show command line help.]' \
-            'list[List project references of a .NET project.]' \
-            'msbuild[Run Microsoft Build Engine (MSBuild) commands.]' \
-            'new[Create a new .NET project or file.]' \
-            'nuget[Provides additional NuGet commands.]' \
-            'pack[Create a NuGet package.]' \
-            'publish[Publish a .NET project for deployment.]' \
-            'remove[Remove a package or reference from a .NET project.]' \
-            'restore[Restore dependencies specified in a .NET project.]' \
-            'run[Build and run a .NET project output.]' \
-            'sln[Modify Visual Studio solution files.]' \
-            'store[Store the specified assemblies in the runtime package store.]' \
-            'test[Run unit tests using the test runner specified in a .NET project.]' \
-            'tool[Install or manage tools that extend the .NET experience.]' \
-            'vstest[Run Microsoft Test Engine (VSTest) commands.]' \
-            'dev-certs[Create and manage development certificates.]' \
-            'fsi[Start F# Interactive / execute F# scripts.]' \
-            'sql-cache[SQL Server cache command-line tools.]' \
-            'user-secrets[Manage development user secrets.]' \
-            'watch[Start a file watcher that runs a command when files change.]'
-        return
-    fi
-
-    if [ $CURRENT -eq 3 ]; then
-        case ${words[2]} in
-        "new")
-            compadd -X ".NET Installed Templates" $(_dotnet_new_completion_cached)
-            return
-            ;;
-        "sln")
-            _values \
-                'add[Add one or more projects to a solution file.]' \
-                'list[List all projects in a solution file.]' \
-                'remove[Remove one or more projects from a solution file.]'
-            return
-            ;;
-        "nuget")
-            _values \
-                'delete[Deletes a package from the server.]' \
-                'locals[Clears or lists local NuGet resources such as http requests cache, packages folder, plugin operations cache  or machine-wide global packages folder.]' \
-                'push[Pushes a package to the server and publishes it.]'
-            return
-            ;;
-        esac
-    fi
-
-    _arguments '*::arguments: _normal'
-}
-
-compdef _dotnet dotnet
-
-# --------------------------------------------------------------------- #
-# Other Aliases                                                         #
-# --------------------------------------------------------------------- #
 alias dr='dotnet run'
 alias dt='dotnet test'
+alias dw='dotnet watch'
+alias dwr='dotnet watch run'
 alias ds='dotnet sln'
 alias da='dotnet add'
 alias dp='dotnet pack'
@@ -1,6 +1,12 @@
 # encode64

-Alias plugin for encoding or decoding using `base64` command
+Alias plugin for encoding or decoding using `base64` command.
+
+To use it, add `encode64` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... encode64)
+```

 ## Functions and Aliases

@@ -9,23 +15,6 @@ Alias plugin for encoding or decoding using `base64` command
 | `encode64` | `e64` | Encodes given data to base64   |
 | `decode64` | `d64` | Decodes given data from base64 |

-## Enabling plugin
-
-1. Edit your `.zshrc` file and add `encode64` to the list of plugins:
-
-   ```sh
-   plugins=(
-     # ...other enabled plugins
-     encode64
-   )
-   ```
-
-2. Restart your terminal session or restart the shell:
-
-   ```sh
-   exec zsh
-   ```
-
 ## Usage and examples

 ### Encoding
@@ -4,6 +4,6 @@ This plugin provides completion for [Fabric](https://www.fabfile.org/).

 To use it add fabric to the plugins array in your zshrc file.

-```bash
+```zsh
 plugins=(... fabric)
 ```
@@ -1,10 +1,10 @@
 fancy-ctrl-z () {
  if [[ $#BUFFER -eq 0 ]]; then
    BUFFER="fg"
-    zle accept-line
+    zle accept-line -w
  else
-    zle push-input
-    zle clear-screen
+    zle push-input -w
+    zle clear-screen -w
  fi
 }
 zle -N fancy-ctrl-z
@@ -1,12 +1,16 @@
-if [ $commands[fasd] ]; then # check if fasd is installed
-  fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
-  if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
-    fasd --init auto >| "$fasd_cache"
-  fi
-  source "$fasd_cache"
-  unset fasd_cache
-
-  alias v='f -e "$EDITOR"'
-  alias o='a -e xdg-open'
-  alias j='zz'
+# check if fasd is installed
+if (( ! ${+commands[fasd]} )); then
+  return
 fi
+
+fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
+if [[ "$commands[fasd]" -nt "$fasd_cache" || ! -s "$fasd_cache" ]]; then
+  fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install \
+    zsh-wcomp zsh-wcomp-install >| "$fasd_cache"
+fi
+source "$fasd_cache"
+unset fasd_cache
+
+alias v='f -e "$EDITOR"'
+alias o='a -e xdg-open'
+alias j='zz'
@@ -3,7 +3,8 @@
 This plugin automatically starts [fbterm](https://github.com/zhangyuanwei/fbterm)
 if on a real TTY (`/dev/tty*`).

-To use it, add fbterm to the plugins array of your zshrc file:
-```
+To use it, add `fbterm` to the plugins array of your zshrc file:
+
+```zsh
 plugins=(... fbterm)
 ```
@@ -1,15 +1,23 @@
-## forklift
+# forklift

 Plugin for ForkLift, an FTP application for OS X.

-### Requirements
+To use it, add `forklift` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... forklift)
+```
+
+## Requirements

 * [ForkLift](https://binarynights.com/)

-### Usage
+## Usage

-<code>fl [*file_or_folder*]</code>
+`fl [<file_or_folder>]`

 * If `fl` is called without arguments then the current folder is opened in ForkLift. This is equivalent to `fl .`.

-* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift. If called with a non-directory file as the argument, then the file's parent directory is opened.
+* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift
+
+* If `fl` is called with a non-directory file as the argument, then the file's parent directory is opened.
@@ -10,6 +10,7 @@ function setup_using_base_dir() {
    if [[ -z "${fzf_base}" ]]; then
        fzfdirs=(
          "${HOME}/.fzf"
+          "${HOME}/.nix-profile/share/fzf"
          "/usr/local/opt/fzf"
          "/usr/share/fzf"
          "/usr/local/share/examples/fzf"
@@ -31,8 +32,8 @@ function setup_using_base_dir() {
    fi

    if [[ -d "${fzf_base}" ]]; then
-        # Fix fzf shell directory for Archlinux package
-        if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then
+        # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
+        if [[ ! -d "${fzf_base}/shell" ]]; then
          fzf_shell="${fzf_base}"
        else
          fzf_shell="${fzf_base}/shell"
@@ -4,6 +4,7 @@ This plugin adds autocompletion for the [gas](http://walle.github.com/gas) comma
 a utility to manage Git authors.

 To use it, add `gas` to the plugins array of your zshrc file:
+
 ```zsh
 plugins=(... gas)
 ```
@@ -1,12 +1,10 @@
-## ZSH-Geeknote
+# Geeknote plugin

-[Geeknote](https://github.com/VitaliyRodnenko/geeknote) plugin for oh-my-zsh.
+This plugin provides autocompletion for [Geeknote](https://github.com/VitaliyRodnenko/geeknote)
+and an alias for `geeknote` called `gn`.

-Plugins provides:
+To use it, add `geeknote` to the plugins array in your zshrc file:

- auto completion of commands and their options
- alias `gn`
-
-You can find information how to install Geeknote and it's available commands on the [project website](http://www.geeknote.me/).
-
-Maintainer : Ján Koščo ([@s7anley](https://twitter.com/s7anley))
+```zsh
+plugins=( ... geeknote ...)
+```
@@ -1,136 +1,157 @@
 #compdef geeknote
-# --------------- ------------------------------------------------------------
-#           Name : _geeknote
-#       Synopsis : zsh completion for geeknote
-#         Author : Ján Koščo <3k.stanley@gmail.com>
-#       HomePage : http://www.geeknote.me
-#        Version : 0.1
-#            Tag : [ shell, zsh, completion, evernote ]
-#      Copyright : © 2014 by Ján Koščo,
-#                  Released under current GPL license.
-# --------------- ------------------------------------------------------------
+
+# Geeknote Autocomplete plugin for Zsh
+# Requires: Geeknote installed
+# Author : Ján Koščo (@s7anley)
+
+__login() {
+    # no arguments
+}
+
+__logout() {
+    _arguments \
+        '--force[Do not ask about logging out.]'
+}
+
+__settings() {
+    _arguments \
+        "--editor+[Set the editor, which use to edit and create notes.]::"
+}
+
+__create() {
+    _arguments \
+        '--title+[The note title.]::' \
+        '--content+[The note content.]::' \
+        '--tags+[One tag or the list of tags which will be added to the note.]::' \
+        '--notebook+[Set the notebook where to save note.]::' \
+        '--resource+[Add a resource to the note.]::'
+}
+
+__edit() {
+    _arguments \
+        '--note+[The name or ID from the previous search of a note to edit.]::' \
+        '--title+[Set new title of the note.]::' \
+        '--content+[Set new content of the note.]::' \
+        '--tags+[Set new list o tags for the note.]::' \
+        '--notebook+[Assign new notebook for the note.]::' \
+        '--resource+[Add a resource to the note.]::'
+}
+
+__find() {
+    _arguments \
+        '--search+[Text to search.]::' \
+        '--tags+[Notes with which tag/tags to search.]::' \
+        '--notebook+[In which notebook search the note.]::' \
+        '--date+[Set date in format dd.mm.yyyy or date range dd.mm.yyyy-dd.mm.yyyy.]::' \
+        '--count+[How many notes show in the result list.]::' \
+        '--with-url[Add direct url of each note in results to Evernote web-version.]' \
+        '--content-search[Search by content, not by title.]' \
+        '--exact-entry[Search for exact entry of the request.]'
+}
+
+__show() {
+    _arguments \
+        '--note+[The name or ID from the previous search of a note to show.]::' \
+        '--raw[Show the raw note body.]'
+}
+
+__remove() {
+    _arguments \
+        '--note+[The name or ID from the previous search of a note to remove.]::' \
+        '--force[Do not ask about removing.]'
+}
+
+__notebook-list() {
+    # no arguments
+}
+
+__notebook-create() {
+    _arguments \
+        '--title+[Set the title of new notebook.]::'
+}
+
+__notebook-edit() {
+    _arguments \
+        '--title+[Set the title of new notebook.]::' \
+        '--notebook+[The name of a notebook to rename.]::'
+}
+
+__tag-list() {
+    # no arguments
+}
+
+__tag-create() {
+    _arguments \
+        '--title+[Set the title of new tag.]::'
+}
+
+__tag-edit() {
+    _arguments \
+        '--tagname+[The name of a tag to rename.]::' \
+        '--title+[Set the new name of tag.]::'
+}
+
+__user() {
+    _arguments \
+        '--full[Show full information.]'
+}

 local -a _1st_arguments
 _1st_arguments=(
-  'login'
-  'logout'
-  'settings'
-  'create'
-  'edit'
-  'find'
-  'show'
-  'remove'
-  'notebook-list'
-  'notebook-create'
-  'notebook-edit'
-  'tag-list'
-  'tag-create'
-  'tag-edit'
-  'tag-remove'
-  'gnsync'
-  'user'
+    'login':'Authorize in Evernote.'
+    'logout':'Logout from Evernote.'
+    'settings':'Show and edit current settings.'
+    'create':'Create note in Evernote.'
+    'edit':'Edit note in Evernote.'
+    'find':'Search notes in Evernote.'
+    'show':'Output note in the terminal.'
+    'remove':'Remove note from Evernote.'
+    'notebook-list':'Show the list of existing notebooks in your Evernote.'
+    'notebook-create':'Create new notebook.'
+    'notebook-edit':'Edit/rename notebook.'
+    'tag-list':'Show the list of existing tags in your Evernote.'
+    'tag-create':'Create new tag.'
+    'tag-edit':'Edit/rename tag.'
+    'user':'Show information about active user.'
 )

 _arguments '*:: :->command'

 if (( CURRENT == 1 )); then
-  _describe -t commands "geeknote command" _1st_arguments
-  return
+    _describe -t commands "geeknote command" _1st_arguments
+    return
 fi

 local -a _command_args
 case "$words[1]" in
-  user)
-    _command_args=(
-      '(--full)--full' \
-    )
-    ;;
-  logout)
-    _command_args=(
-      '(--force)--force' \
-    )
-    ;;
-  settings)
-    _command_args=(
-      '(--editor)--editor' \
-    )
-    ;;
-  create)
-    _command_args=(
-      '(-t|--title)'{-t,--title}'[note title]' \
-      '(-c|--content)'{-c,--content}'[note content]' \
-      '(-tg|--tags)'{-tg,--tags}'[one tag or the list of tags which will be added to the note]' \
-      '(-nb|--notebook)'{-nb,--notebook}'[name of notebook where to save note]' \
-    )
-    ;;
-  edit)
-    _command_args=(
-      '(-n|--note)'{-n,--note}'[name or ID from the previous search of a note to edit]' \
-      '(-t|--title)'{-t,--title}'[note title]' \
-      '(-c|--content)'{-c,--content}'[note content]' \
-      '(-tg|--tags)'{-tg,--tags}'[one tag or the list of tags which will be added to the note]' \
-      '(-nb|--notebook)'{-nb,--notebook}'[name of notebook where to save note]' \
-    )
-    ;;
-  remove)
-    _command_args=(
-      '(-n|--note)'{-n,--note}'[name or ID from the previous search of a note to edit]' \
-      '(--force)--force' \
-    )
-    ;;
-  show)
-    _command_args=(
-      '(-n|--note)'{-n,--note}'[name or ID from the previous search of a note to edit]' \
-    )
-    ;;
-  find)
-    _command_args=(
-      '(-s|--search)'{-s,--search}'[text to search]' \
-      '(-tg|--tags)'{-tg,--tags}'[notes with which tag/tags to search]' \
-      '(-nb|--notebook)'{-nb,--notebook}'[in which notebook search the note]' \
-      '(-d|--date)'{-d,--date}'[date in format dd.mm.yyyy or date range dd.mm.yyyy-dd.mm.yyyy]' \
-      '(-cn|--count)'{-cn,--count}'[how many notes show in the result list]' \
-      '(-uo|--url-only)'{-uo,--url-only}'[add direct url of each note in results to Evernote web-version]' \
-      '(-ee|--exact-entry)'{-ee,--exact-entry}'[search for exact entry of the request]' \
-      '(-cs|--content-search)'{-cs,--content-search}'[search by content, not by title]' \
-    )
-    ;;
-  notebook-create)
-    _command_args=(
-      '(-t|--title)'{-t,--title}'[notebook title]' \
-    )
-    ;;
-  notebook-edit)
-    _command_args=(
-      '(-nb|--notebook)'{-nb,--notebook}'[name of notebook to rename]' \
-      '(-t|--title)'{-t,--title}'[new notebook title]' \
-    )
-    ;;
-  notebook-remove)
-    _command_args=(
-      '(-nb|--notebook)'{-nb,--notebook}'[name of notebook to remove]' \
-      '(--force)--force' \
-    )
-    ;;
-  tag-create)
-    _command_args=(
-      '(-t|--title)'{-t,--title}'[title of tag]' \
-    )
-    ;;
-  tag-edit)
-    _command_args=(
-      '(-tgn|--tagname)'{-tgn,--tagname}'[tag to edit]' \
-      '(-t|--title)'{-t,--title}'[new tag name]' \
-    )
-    ;;
-  tag-remove)
-    _command_args=(
-      '(-tgn|--tagname)'{-tgn,--tagname}'[tag to remove]' \
-      '(--force)--force' \
-    )
-    ;;
-  esac
-
-_arguments \
-  $_command_args \
-  &&  return 0
+    login)
+       __login ;;
+    logout)
+        __logout ;;
+    settings)
+        __settings ;;
+    create)
+        __create ;;
+    edit)
+        __edit ;;
+    find)
+        __find ;;
+    show)
+        __show ;;
+    remove)
+        __remove ;;
+    notebook-list)
+        __notebook-list ;;
+    notebook-create)
+        __notebook-create ;;
+    notebook-edit)
+        __notebook-edit ;;
+    tag-list)
+        __tag-list ;;
+    tag-create)
+        __tag-create ;;
+    tag-edit)
+        __tag-edit ;;
+    user)
+        __user ;;
+esac
@@ -2,10 +2,16 @@

 This plugin provides completion definitions for some of the commands defined by [git-extras](https://github.com/tj/git-extras).

-##  Setup notes
+To use it, add `git-extras` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-extras)
+```
+
+## Setup notes

 The completions work by augmenting the `_git` completion provided by `zsh`. This only works with the `zsh`-provided `_git`, not the `_git` provided by `git` itself. If you have both `zsh` and `git` installed, you need to make sure that the `zsh`-provided `_git` takes precedence.

 ### OS X Homebrew Setup

-On OS X with Homebrew, you need to install `git` with `brew install git --without-completions`. Otherwise, `git`'s `_git` will take precedence, and you won't see the completions for `git-extras` commands.
+**NOTE:** this no longer works on current Homebrew distributions of git. ~~On OS X with Homebrew, you need to install `git` with `brew install git --without-completions`. Otherwise, `git`'s `_git` will take precedence, and you won't see the completions for `git-extras` commands.~~
@@ -1,18 +1,15 @@
 # Git-Flow plugin

-This plugin adds completion and aliases for the `git-flow` command. More information
-at https://github.com/nvie/gitflow.
+This plugin adds completion and aliases for the [`git-flow` command](https://github.com/nvie/gitflow).

-Enable git-flow plugin in your zshrc file:
-```
+To use it, add `git-flow` to the plugins array in your zshrc file:
+
+```zsh
 plugins=(... git-flow)
 ```

 ## Aliases

-More information about `git-flow` commands:
-https://github.com/nvie/gitflow/wiki/Command-Line-Arguments
-
 | Alias   | Command                    | Description                            |
 |---------|----------------------------|----------------------------------------|
 | `gfl`   | `git flow`                 | Git-Flow command                       |
@@ -30,3 +27,5 @@ https://github.com/nvie/gitflow/wiki/Command-Line-Arguments
 | `gflfp` | `git flow feature publish` | Publish feature: `gflfp <name>`        |
 | `gflhf` | `git flow hotfix finish`   | Finish hotfix: `gflhf <version>`       |
 | `gflrf` | `git flow release finish`  | Finish release: `gflrf <version>`      |
+
+[More information about `git-flow` commands](https://github.com/nvie/gitflow/wiki/Command-Line-Arguments).
@@ -3,8 +3,9 @@
 This plugin adds completion for [`grb`](https://github.com/webmat/git_remote_branch),
 or `git_remote_branch`.

-To use it, add `git-remote-branch` to the plugins array of your `.zshrc` file:
-```
+To use it, add `git-remote-branch` to the plugins array of your zshrc file:
+
+```zsh
 plugins=(... git-remote-branch)
 ```

@@ -10,194 +10,196 @@ plugins=(... git)

 ## Aliases

-| Alias                | Command                                                                                                                       |
-|:---------------------|:------------------------------------------------------------------------------------------------------------------------------|
-| g                    | git                                                                                                                           |
-| ga                   | git add                                                                                                                       |
-| gaa                  | git add --all                                                                                                                 |
-| gapa                 | git add --patch                                                                                                               |
-| gau                  | git add --update                                                                                                              |
-| gav                  | git add --verbose                                                                                                             |
-| gap                  | git apply                                                                                                                     |
-| gb                   | git branch                                                                                                                    |
-| gba                  | git branch -a                                                                                                                 |
-| gbd                  | git branch -d                                                                                                                 |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+|\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
-| gbD                  | git branch -D                                                                                                                 |
-| gbl                  | git blame -b -w                                                                                                               |
-| gbnm                 | git branch --no-merged                                                                                                        |
-| gbr                  | git branch --remote                                                                                                           |
-| gbs                  | git bisect                                                                                                                    |
-| gbsb                 | git bisect bad                                                                                                                |
-| gbsg                 | git bisect good                                                                                                               |
-| gbsr                 | git bisect reset                                                                                                              |
-| gbss                 | git bisect start                                                                                                              |
-| gc                   | git commit -v                                                                                                                 |
-| gc!                  | git commit -v --amend                                                                                                         |
-| gcn!                 | git commit -v --no-edit --amend                                                                                               |
-| gca                  | git commit -v -a                                                                                                              |
-| gca!                 | git commit -v -a --amend                                                                                                      |
-| gcan!                | git commit -v -a --no-edit --amend                                                                                            |
-| gcans!               | git commit -v -a -s --no-edit --amend                                                                                         |
-| gcam                 | git commit -a -m                                                                                                              |
-| gcsm                 | git commit -s -m                                                                                                              |
-| gcb                  | git checkout -b                                                                                                               |
-| gcf                  | git config --list                                                                                                             |
-| gcl                  | git clone --recurse-submodules                                                                                                |
-| gclean               | git clean -id                                                                                                                 |
-| gpristine            | git reset --hard && git clean -dfx                                                                                            |
-| gcm                  | git checkout master                                                                                                           |
-| gcd                  | git checkout develop                                                                                                          |
-| gcmsg                | git commit -m                                                                                                                 |
-| gco                  | git checkout                                                                                                                  |
-| gcount               | git shortlog -sn                                                                                                              |
-| gcp                  | git cherry-pick                                                                                                               |
-| gcpa                 | git cherry-pick --abort                                                                                                       |
-| gcpc                 | git cherry-pick --continue                                                                                                    |
-| gcs                  | git commit -S                                                                                                                 |
-| gd                   | git diff                                                                                                                      |
-| gdca                 | git diff --cached                                                                                                             |
-| gdcw                 | git diff --cached --word-diff                                                                                                 |
-| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                      |
-| gds                  | git diff --staged                                                                                                             |
-| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                   |
-| gdv                  | git diff -w $@ \| view -                                                                                                      |
-| gdw                  | git diff --word-diff                                                                                                          |
-| gf                   | git fetch                                                                                                                     |
-| gfa                  | git fetch --all --prune                                                                                                       |
-| gfg                  | git ls-files \| grep                                                                                                          |
-| gfo                  | git fetch origin                                                                                                              |
-| gg                   | git gui citool                                                                                                                |
-| gga                  | git gui citool --amend                                                                                                        |
-| ggf                  | git push --force origin $(current_branch)                                                                                     |
-| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                          |
-| ggl                  | git pull origin $(current_branch)                                                                                             |
-| ggp                  | git push origin $(current_branch)                                                                                             |
-| ggpnp                | ggl && ggp                                                                                                                    |
-| ggpull               | git pull origin "$(git_current_branch)"                                                                                       |
-| ggpur                | ggu                                                                                                                           |
-| ggpush               | git push origin "$(git_current_branch)"                                                                                       |
-| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                     |
-| ggu                  | git pull --rebase origin $(current_branch)                                                                                    |
-| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                          |
-| ghh                  | git help                                                                                                                      |
-| gignore              | git update-index --assume-unchanged                                                                                           |
-| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                        |
-| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk                                                                            |
-| gk                   | gitk --all --branches                                                                                                         |
-| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                          |
-| gl                   | git pull                                                                                                                      |
-| glg                  | git log --stat                                                                                                                |
-| glgp                 | git log --stat -p                                                                                                             |
-| glgg                 | git log --graph                                                                                                               |
-| glgga                | git log --graph --decorate --all                                                                                              |
-| glgm                 | git log --graph --max-count=10                                                                                                |
-| glo                  | git log --oneline --decorate                                                                                                  |
-| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'                        |
-| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat                 |
-| glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                        |
-| glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short           |
-| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                  |
-| glog                 | git log --oneline --decorate --graph                                                                                          |
-| gloga                | git log --oneline --decorate --graph --all                                                                                    |
-| glp                  | `_git_log_prettily`                                                                                                           |
-| gm                   | git merge                                                                                                                     |
-| gmom                 | git merge origin/master                                                                                                       |
-| gmt                  | git mergetool --no-prompt                                                                                                     |
-| gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                      |
-| gmum                 | git merge upstream/master                                                                                                     |
-| gma                  | git merge --abort                                                                                                             |
-| gp                   | git push                                                                                                                      |
-| gpd                  | git push --dry-run                                                                                                            |
-| gpf                  | git push --force-with-lease                                                                                                   |
-| gpf!                 | git push --force                                                                                                              |
-| gpoat                | git push origin --all && git push origin --tags                                                                               |
-| gpu                  | git push upstream                                                                                                             |
-| gpv                  | git push -v                                                                                                                   |
-| gr                   | git remote                                                                                                                    |
-| gra                  | git remote add                                                                                                                |
-| grb                  | git rebase                                                                                                                    |
-| grba                 | git rebase --abort                                                                                                            |
-| grbc                 | git rebase --continue                                                                                                         |
-| grbd                 | git rebase develop                                                                                                            |
-| grbi                 | git rebase -i                                                                                                                 |
-| grbm                 | git rebase master                                                                                                             |
-| grbs                 | git rebase --skip                                                                                                             |
-| grev                 | git revert                                                                                                                   |
-| grh                  | git reset                                                                                                                     |
-| grhh                 | git reset --hard                                                                                                              |
-| groh                 | git reset origin/$(git_current_branch) --hard                                                                                 |
-| grm                  | git rm                                                                                                                        |
-| grmc                 | git rm --cached                                                                                                               |
-| grmv                 | git remote rename                                                                                                             |
-| grrm                 | git remote remove                                                                                                             |
-| grs                  | git restore                                                                                                                   |
-| grset                | git remote set-url                                                                                                            |
-| grss                 | git restore --source                                                                                                          |
-| grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                             |
-| gru                  | git reset --                                                                                                                  |
-| grup                 | git remote update                                                                                                             |
-| grv                  | git remote -v                                                                                                                 |
-| gsb                  | git status -sb                                                                                                                |
-| gsd                  | git svn dcommit                                                                                                               |
-| gsh                  | git show                                                                                                                      |
-| gsi                  | git submodule init                                                                                                            |
-| gsps                 | git show --pretty=short --show-signature                                                                                      |
-| gsr                  | git svn rebase                                                                                                                |
-| gss                  | git status -s                                                                                                                 |
-| gst                  | git status                                                                                                                    |
-| gsta                 | git stash push                                                                                                                |
-| gsta                 | git stash save                                                                                                                |
-| gstaa                | git stash apply                                                                                                               |
-| gstc                 | git stash clear                                                                                                               |
-| gstd                 | git stash drop                                                                                                                |
-| gstl                 | git stash list                                                                                                                |
-| gstp                 | git stash pop                                                                                                                 |
-| gsts                 | git stash show --text                                                                                                         |
-| gstall               | git stash --all                                                                                                               |
-| gsu                  | git submodule update                                                                                                          |
-| gsw                  | git switch                                                                                                                    |
-| gswc                 | git switch -c                                                                                                                 |
-| gts                  | git tag -s                                                                                                                    |
-| gtv                  | git tag \| sort -V                                                                                                            |
-| gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                    |
-| gunignore            | git update-index --no-assume-unchanged                                                                                        |
-| gunwip               | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1                                                                  |
-| gup                  | git pull --rebase                                                                                                             |
-| gupv                 | git pull --rebase -v                                                                                                          |
-| gupa                 | git pull --rebase --autostash                                                                                                 |
-| gupav                | git pull --rebase --autostash -v                                                                                              |
-| glum                 | git pull upstream master                                                                                                      |
-| gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                            |
-| gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"        |
+| Alias                | Command                                                                                                                          |
+|:---------------------|:---------------------------------------------------------------------------------------------------------------------------------|
+| g                    | git                                                                                                                              |
+| ga                   | git add                                                                                                                          |
+| gaa                  | git add --all                                                                                                                    |
+| gapa                 | git add --patch                                                                                                                  |
+| gau                  | git add --update                                                                                                                 |
+| gav                  | git add --verbose                                                                                                                |
+| gap                  | git apply                                                                                                                        |
+| gb                   | git branch                                                                                                                       |
+| gba                  | git branch -a                                                                                                                    |
+| gbd                  | git branch -d                                                                                                                    |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbD                  | git branch -D                                                                                                                    |
+| gbl                  | git blame -b -w                                                                                                                  |
+| gbnm                 | git branch --no-merged                                                                                                           |
+| gbr                  | git branch --remote                                                                                                              |
+| gbs                  | git bisect                                                                                                                       |
+| gbsb                 | git bisect bad                                                                                                                   |
+| gbsg                 | git bisect good                                                                                                                  |
+| gbsr                 | git bisect reset                                                                                                                 |
+| gbss                 | git bisect start                                                                                                                 |
+| gc                   | git commit -v                                                                                                                    |
+| gc!                  | git commit -v --amend                                                                                                            |
+| gcn!                 | git commit -v --no-edit --amend                                                                                                  |
+| gca                  | git commit -v -a                                                                                                                 |
+| gca!                 | git commit -v -a --amend                                                                                                         |
+| gcan!                | git commit -v -a --no-edit --amend                                                                                               |
+| gcans!               | git commit -v -a -s --no-edit --amend                                                                                            |
+| gcam                 | git commit -a -m                                                                                                                 |
+| gcsm                 | git commit -s -m                                                                                                                 |
+| gcb                  | git checkout -b                                                                                                                  |
+| gcf                  | git config --list                                                                                                                |
+| gcl                  | git clone --recurse-submodules                                                                                                   |
+| gclean               | git clean -id                                                                                                                    |
+| gpristine            | git reset --hard && git clean -dffx                                                                                              |
+| gcm                  | git checkout master                                                                                                              |
+| gcd                  | git checkout develop                                                                                                             |
+| gcmsg                | git commit -m                                                                                                                    |
+| gco                  | git checkout                                                                                                                     |
+| gcount               | git shortlog -sn                                                                                                                 |
+| gcp                  | git cherry-pick                                                                                                                  |
+| gcpa                 | git cherry-pick --abort                                                                                                          |
+| gcpc                 | git cherry-pick --continue                                                                                                       |
+| gcs                  | git commit -S                                                                                                                    |
+| gd                   | git diff                                                                                                                         |
+| gdca                 | git diff --cached                                                                                                                |
+| gdcw                 | git diff --cached --word-diff                                                                                                    |
+| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                         |
+| gds                  | git diff --staged                                                                                                                |
+| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
+| gdv                  | git diff -w $@ \| view -                                                                                                         |
+| gdw                  | git diff --word-diff                                                                                                             |
+| gf                   | git fetch                                                                                                                        |
+| gfa                  | git fetch --all --prune                                                                                                          |
+| gfg                  | git ls-files \| grep                                                                                                             |
+| gfo                  | git fetch origin                                                                                                                 |
+| gg                   | git gui citool                                                                                                                   |
+| gga                  | git gui citool --amend                                                                                                           |
+| ggf                  | git push --force origin $(current_branch)                                                                                        |
+| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                             |
+| ggl                  | git pull origin $(current_branch)                                                                                                |
+| ggp                  | git push origin $(current_branch)                                                                                                |
+| ggpnp                | ggl && ggp                                                                                                                       |
+| ggpull               | git pull origin "$(git_current_branch)"                                                                                          |
+| ggpur                | ggu                                                                                                                              |
+| ggpush               | git push origin "$(git_current_branch)"                                                                                          |
+| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                        |
+| ggu                  | git pull --rebase origin $(current_branch)                                                                                       |
+| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                             |
+| ghh                  | git help                                                                                                                         |
+| gignore              | git update-index --assume-unchanged                                                                                              |
+| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
+| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk                                                                               |
+| gk                   | gitk --all --branches                                                                                                            |
+| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
+| gl                   | git pull                                                                                                                         |
+| glg                  | git log --stat                                                                                                                   |
+| glgp                 | git log --stat -p                                                                                                                |
+| glgg                 | git log --graph                                                                                                                  |
+| glgga                | git log --graph --decorate --all                                                                                                 |
+| glgm                 | git log --graph --max-count=10                                                                                                   |
+| glo                  | git log --oneline --decorate                                                                                                     |
+| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'                           |
+| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat                    |
+| glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                           |
+| glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short              |
+| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                     |
+| glog                 | git log --oneline --decorate --graph                                                                                             |
+| gloga                | git log --oneline --decorate --graph --all                                                                                       |
+| glp                  | `_git_log_prettily`                                                                                                              |
+| gm                   | git merge                                                                                                                        |
+| gmom                 | git merge origin/master                                                                                                          |
+| gmt                  | git mergetool --no-prompt                                                                                                        |
+| gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
+| gmum                 | git merge upstream/master                                                                                                        |
+| gma                  | git merge --abort                                                                                                                |
+| gp                   | git push                                                                                                                         |
+| gpd                  | git push --dry-run                                                                                                               |
+| gpf                  | git push --force-with-lease                                                                                                      |
+| gpf!                 | git push --force                                                                                                                 |
+| gpoat                | git push origin --all && git push origin --tags                                                                                  |
+| gpu                  | git push upstream                                                                                                                |
+| gpv                  | git push -v                                                                                                                      |
+| gr                   | git remote                                                                                                                       |
+| gra                  | git remote add                                                                                                                   |
+| grb                  | git rebase                                                                                                                       |
+| grba                 | git rebase --abort                                                                                                               |
+| grbc                 | git rebase --continue                                                                                                            |
+| grbd                 | git rebase develop                                                                                                               |
+| grbi                 | git rebase -i                                                                                                                    |
+| grbm                 | git rebase master                                                                                                                |
+| grbs                 | git rebase --skip                                                                                                                |
+| grev                 | git revert                                                                                                                       |
+| grh                  | git reset                                                                                                                        |
+| grhh                 | git reset --hard                                                                                                                 |
+| groh                 | git reset origin/$(git_current_branch) --hard                                                                                    |
+| grm                  | git rm                                                                                                                           |
+| grmc                 | git rm --cached                                                                                                                  |
+| grmv                 | git remote rename                                                                                                                |
+| grrm                 | git remote remove                                                                                                                |
+| grs                  | git restore                                                                                                                      |
+| grset                | git remote set-url                                                                                                               |
+| grss                 | git restore --source                                                                                                             |
+| grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                                |
+| gru                  | git reset --                                                                                                                     |
+| grup                 | git remote update                                                                                                                |
+| grv                  | git remote -v                                                                                                                    |
+| gsb                  | git status -sb                                                                                                                   |
+| gsd                  | git svn dcommit                                                                                                                  |
+| gsh                  | git show                                                                                                                         |
+| gsi                  | git submodule init                                                                                                               |
+| gsps                 | git show --pretty=short --show-signature                                                                                         |
+| gsr                  | git svn rebase                                                                                                                   |
+| gss                  | git status -s                                                                                                                    |
+| gst                  | git status                                                                                                                       |
+| gsta                 | git stash push                                                                                                                   |
+| gsta                 | git stash save                                                                                                                   |
+| gstaa                | git stash apply                                                                                                                  |
+| gstc                 | git stash clear                                                                                                                  |
+| gstd                 | git stash drop                                                                                                                   |
+| gstl                 | git stash list                                                                                                                   |
+| gstp                 | git stash pop                                                                                                                    |
+| gsts                 | git stash show --text                                                                                                            |
+| gstu                 | git stash --include-untracked                                                                                                    |
+| gstall               | git stash --all                                                                                                                  |
+| gsu                  | git submodule update                                                                                                             |
+| gsw                  | git switch                                                                                                                       |
+| gswc                 | git switch -c                                                                                                                    |
+| gts                  | git tag -s                                                                                                                       |
+| gtv                  | git tag \| sort -V                                                                                                               |
+| gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                       |
+| gunignore            | git update-index --no-assume-unchanged                                                                                           |
+| gunwip               | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1                                                                     |
+| gup                  | git pull --rebase                                                                                                                |
+| gupv                 | git pull --rebase -v                                                                                                             |
+| gupa                 | git pull --rebase --autostash                                                                                                    |
+| gupav                | git pull --rebase --autostash -v                                                                                                 |
+| glum                 | git pull upstream master                                                                                                         |
+| gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
+| gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |

-### Deprecated
+### Deprecated aliases

 These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.

-| Alias  |                                Command                                             |                                             Modification                                            |
-| :----- | :----------------------------------------------------------------------------------| --------------------------------------------------------------------------------------------------- |
-| gap    | git add --patch                                                                    | new alias `gapa`                                                                                    |
-| gcl    | git config --list                                                                  | new alias `gcf`                                                                                     |
-| gdc    | git diff --cached                                                                  | new alias `gdca`                                                                                    |
-| gdt    | git difftool                                                                       | no replacement                                                                                      |
-| ggpull | git pull origin $(current_branch)                                                  | new alias `ggl` (`ggpull` still exists for now though)                                              |
-| ggpur  | git pull --rebase origin $(current_branch)                                         | new alias `ggu` (`ggpur` still exists for now though)                                               |
-| ggpush | git push origin $(current_branch)                                                  | new alias `ggp` (`ggpush` still exists for now though)                                              |
-| gk     | gitk --all --branches                                                              | now aliased to `gitk --all --branches`                                                              |
-| glg    | git log --stat --max-count = 10                                                    | now aliased to `git log --stat --color`                                                             |
-| glgg   | git log --graph --max-count = 10                                                   | now aliased to `git log --graph --color`                                                            |
-| gwc    | git whatchanged -p --abbrev-commit --pretty = medium                               | new alias `gwch`                                                                                    |
+| Alias  | Command                                                | Modification                                           |
+| :----- | :----------------------------------------------------- | :----------------------------------------------------- |
+| gap    | `git add --patch`                                      | new alias `gapa`                                       |
+| gcl    | `git config --list`                                    | new alias `gcf`                                        |
+| gdc    | `git diff --cached`                                    | new alias `gdca`                                       |
+| gdt    | `git difftool`                                         | no replacement                                         |
+| ggpull | `git pull origin $(current_branch)`                    | new alias `ggl` (`ggpull` still exists for now though) |
+| ggpur  | `git pull --rebase origin $(current_branch)`           | new alias `ggu` (`ggpur` still exists for now though)  |
+| ggpush | `git push origin $(current_branch)`                    | new alias `ggp` (`ggpush` still exists for now though) |
+| gk     | `gitk --all --branches`                                | now aliased to `gitk --all --branches`                 |
+| glg    | `git log --stat --max-count = 10`                      | now aliased to `git log --stat --color`                |
+| glgg   | `git log --graph --max-count = 10`                     | now aliased to `git log --graph --color`               |
+| gwc    | `git whatchanged -p --abbrev-commit --pretty = medium` | new alias `gwch`                                       |

 ## Functions

 ### Current

-| Command                | Description                             |
-|:-----------------------|:----------------------------------------|
-| current_branch         | Return the name of the current branch   |
-| git_current_user_name  | Returns the `user.name` config value    |
-| git_current_user_email | Returns the `user.email` config value   |
+| Command                | Description                                              |
+|:-----------------------|:---------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote |
+| current_branch         | Return the name of the current branch                    |
+| git_current_user_name  | Returns the `user.name` config value                     |
+| git_current_user_email | Returns the `user.email` config value                    |

 ### Work in Progress (WIP)

@@ -209,7 +211,7 @@ These features allow to pause a branch development and switch to another one (_"
 | gwip             | Commit wip branch                               |
 | gunwip           | Uncommit wip branch                             |

-### Deprecated
+### Deprecated functions

 | Command                | Description                             | Reason                                                          |
 |:-----------------------|:----------------------------------------|:----------------------------------------------------------------|
@@ -66,7 +66,7 @@ alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
-alias gpristine='git reset --hard && git clean -dfx'
+alias gpristine='git reset --hard && git clean -dffx'
 alias gcm='git checkout master'
 alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
@@ -236,6 +236,7 @@ alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
+alias gstu='git stash --include-untracked'
 alias gstall='git stash --all'
 alias gsu='git submodule update'
 alias gsw='git switch'
@@ -255,3 +256,17 @@ alias glum='git pull upstream master'

 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
+
+function grename() {
+  if [[ -z "$1" || -z "$2" ]]; then
+    echo "Usage: $0 old_branch new_branch"
+    return 1
+  fi
+
+  # Rename branch locally
+  git branch -m "$1" "$2"
+  # Rename branch in origin remote
+  if git push origin :"$1"; then
+    git push --set-upstream origin "$2"
+  fi
+}
@@ -1,6 +1,6 @@
 # Gitfast plugin

-This plugin adds completion for Git, using the zsh completion from git.git folks, which is much faster than the official one from zsh. A lot of zsh-specific features are not supported, like descriptions for every argument, but everything the bash completion has, this one does too (as it is using it behind the scenes). Not only is it faster, it should be more robust, and updated regularly to the latest git upstream version..
+This plugin adds completion for Git, using the zsh completion from git.git folks, which is much faster than the official one from zsh. A lot of zsh-specific features are not supported, like descriptions for every argument, but everything the bash completion has, this one does too (as it is using it behind the scenes). Not only is it faster, it should be more robust, and updated regularly to the latest git upstream version.

 To use it, add `gitfast` to the plugins array in your zshrc file:

@@ -1,4 +1,4 @@
-#  github
+# github plugin

 This plugin supports working with GitHub from the command line. It provides a few things:

@@ -6,7 +6,7 @@ This plugin supports working with GitHub from the command line. It provides a fe
 * Completion for the `github` Ruby gem.
 * Convenience functions for working with repos and URLs.

-###  Functions
+### Functions

 * `empty_gh` - Creates a new empty repo (with a `README.md`) and pushes it to GitHub
 * `new_gh` - Initializes an existing directory as a repo and pushes it to GitHub
@@ -14,13 +14,13 @@ This plugin supports working with GitHub from the command line. It provides a fe
 * `git.io` - Shortens a URL using [git.io](https://git.io)


-##  Installation
+## Installation

 [Hub](https://github.com/github/hub) needs to be installed if you want to use it. On OS X with Homebrew, this can be done with `brew install hub`. The `hub` completion definition needs to be added to your `$FPATH` before initializing OMZ.

 The [`github` Ruby gem](https://github.com/defunkt/github-gem) needs to be installed if you want to use it.

-###  Configuration
+### Configuration

 These settings affect `github`'s behavior.

@@ -35,7 +35,7 @@ These settings affect `github`'s behavior.

 See `man hub` for more details.

-###  Homebrew installation note
+### Homebrew installation note

 If you have installed `hub` using Homebrew, its completions may not be on your `$FPATH` if you are using the system `zsh`. Homebrew installs `zsh` completion definitions to `/usr/local/share/zsh/site-functions`, which will be on `$FPATH` for the Homebrew-installed `zsh`, but not for the system `zsh`. If you want it to work with the system `zsh`, add this to your `~/.zshrc` before it sources `oh-my-zsh.sh`.

@@ -1,4 +1,4 @@
-function gi() { curl -fL https://www.gitignore.io/api/${(j:,:)@} }
+function gi() { curl -fLw '\n' https://www.gitignore.io/api/"${(j:,:)@}" }

 _gitignoreio_get_command_list() {
  curl -sfL https://www.gitignore.io/api/list | tr "," "\n"
@@ -36,7 +36,7 @@ __gnu_utils() {
  gcmds+=('gfind' 'gxargs' 'glocate')

  # Not part of either coreutils or findutils, installed separately.
-  gcmds+=('gsed' 'gtar' 'gtime')
+  gcmds+=('gsed' 'gtar' 'gtime' 'gmake')

  for gcmd in "${gcmds[@]}"; do
    # Do nothing if the command isn't found
@@ -3,6 +3,7 @@
 Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.

 To use it, add gpg-agent to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... gpg-agent)
 ```
@@ -1,4 +1,4 @@
-## Gradle Plugin
+# Gradle plugin

 This plugin adds completions and aliases for [Gradle](https://gradle.org/).

@@ -10,9 +10,15 @@ plugins=(... gradle)

 ## Usage

-This plugin creates an alias `gradle` which is used to determine whether the current working directory has a gradlew file. If gradlew is present it will be used otherwise `gradle` is used directly. Gradle tasks can be executed directly without regard for whether it is `gradle` or `gradlew`
+This plugin creates a function called `gradle-or-gradlew`, which is aliased
+to `gradle`, which is used to determine whether the current project directory
+has a gradlew file. If `gradlew` is present it will be used, otherwise `gradle`
+is used instead. Gradle tasks can be executed directly without regard for
+whether it is `gradle` or `gradlew`. It also supports being called from
+any directory inside the root project directory.

 Examples:
+
 ```zsh
 gradle test
 gradle build
@@ -20,4 +26,5 @@ gradle build

 ## Completion

-The completion provided for this plugin caches the parsed tasks into a file named `.gradletasknamecache` in the current working directory, so you might want to add that to your `.gitignore` file so that it's not accidentally committed.
+This plugin uses [the completion from the Gradle project](https://github.com/gradle/gradle-completion),
+which is distributed under the MIT license.
@@ -1,184 +1,26 @@
-##############################################################################
-# A descriptive listing of core Gradle commands
-############################################################################
-
-gradle-or-gradlew() {
-	if [ -f ./gradlew ] ; then
-		echo "executing gradlew instead of gradle";
-		./gradlew "$@";
-	else
-		gradle "$@";
-	fi
-}
-
-alias gradle=gradle-or-gradlew;
-
-function _gradle_core_commands() {
-    local ret=1 state
-    _arguments ':subcommand:->subcommand' && ret=0
-
-    case $state in
-      subcommand)
-        subcommands=(
-          "properties:Display all project properties"
-          "tasks:Calculate and display all tasks"
-          "dependencies:Calculate and display all dependencies"
-          "projects:Discover and display all sub-projects"
-          "build:Build the project"
-          "help:Display help"
-        )
-        _describe -t subcommands 'gradle subcommands' subcommands && ret=0
-    esac
-
-    return ret
-}
-
-function _gradle_arguments() {
-    _arguments -C \
-    '-a[Do not rebuild project dependencies]' \
-    '-b[Specifies the build file]' \
-    '-c[Specifies the settings file]' \
-    '-d[Log at the debug level]' \
-    '-g[Specifies the Gradle user home directory]' \
-    '-h[Shows a help message]' \
-    '-i[Set log level to INFO]' \
-    '-m[Runs the build with all task actions disabled]' \
-    '-p[Specifies the start directory for Gradle]' \
-    '-q[Log errors only]' \
-    '-s[Print out the stacktrace also for user exceptions]' \
-    '-t[Continuous mode. Automatically re-run build after changes]' \
-    '-u[Don''t search in parent directories for a settings.gradle file]' \
-    '-v[Prints Gradle version info]' \
-    '-x[Specify a task to be excluded]' \
-    '-D[Set a system property]' \
-    '-I[Specifies an initialization script]' \
-    '-P[Sets a project property of the root project]' \
-    '-S[Print out the full (very verbose) stacktrace]' \
-    '--build-file[Specifies the build file]' \
-    '--configure-on-demand[Only relevant projects are configured]' \
-    '--console[Type of console output to generate (plain, auto, or rich)]' \
-    '--continue[Continues task execution after a task failure]' \
-    '--continuous[Continuous mode. Automatically re-run build after changes]' \
-    '--daemon[Use the Gradle Daemon]' \
-    '--debug[Log at the debug level]' \
-    '--dry-run[Runs the build with all task actions disabled]' \
-    '--exclude-task[Specify a task to be excluded]' \
-    '--full-stacktrace[Print out the full (very verbose) stacktrace]' \
-    '--gradle-user-home[Specifies the Gradle user home directory]' \
-    '--gui[Launches the Gradle GUI app (Deprecated)]' \
-    '--help[Shows a help message]' \
-    '--include-build[Run the build as a composite, including the specified build]' \
-    '--info[Set log level to INFO]' \
-    '--init-script[Specifies an initialization script]' \
-    '--max-workers[Set the maximum number of workers that Gradle may use]' \
-    '--no-daemon[Do not use the Gradle Daemon]' \
-    '--no-rebuild[Do not rebuild project dependencies]' \
-    '--no-search-upwards[Don''t search in parent directories for a settings.gradle file]' \
-    '--offline[Build without accessing network resources]' \
-    '--parallel[Build projects in parallel]' \
-    '--profile[Profile build time and create report]' \
-    '--project-cache-dir[Specifies the project-specific cache directory]' \
-    '--project-dir[Specifies the start directory for Gradle]' \
-    '--project-prop[Sets a project property of the root project]' \
-    '--quiet[Log errors only]' \
-    '--recompile-scripts[Forces scripts to be recompiled, bypassing caching]' \
-    '--refresh-dependencies[Refresh the state of dependencies]' \
-    '--rerun-task[Specifies that any task optimization is ignored]' \
-    '--settings-file[Specifies the settings file]' \
-    '--stacktrace[Print out the stacktrace also for user exceptions]' \
-    '--status[Print Gradle Daemon status]' \
-    '--stop[Stop all Gradle Daemons]' \
-    '--system-prop[Set a system property]' \
-    '--version[Prints Gradle version info]' \
-    '*::command:->command' \
-    && return 0
-}
-
-
-##############################################################################
-# Examine the build.gradle file to see if its timestamp has changed;
-# and if so, regenerate the .gradle_tasks cache file
-############################################################################
-_gradle_does_task_list_need_generating () {
-  [[ ! -f .gradletasknamecache ]] || [[ build.gradle -nt .gradletasknamecache || build.gradle.kts -nt .gradletasknamecache ]]
-}
-
-##############
-# Parse the tasks from `gradle(w) tasks --all` and return them to the calling function.
-# All lines in the output from gradle(w) that are between /^-+$/ and /^\s*$/
-# are considered to be tasks. If and when gradle adds support for listing tasks
-# for programmatic parsing, this method can be deprecated.
-##############
-_gradle_parse_tasks () {
-  lines_might_be_tasks=false
-  task_name_buffer=""
-  while read -r line; do
-    if [[ $line =~ ^-+$ ]]; then
-      lines_might_be_tasks=true
-      # Empty buffer, because it contains items that are not tasks
-      task_name_buffer=""
-    elif [[ $line =~ ^\s*$ ]]; then
-      if [[ "$lines_might_be_tasks" = true ]]; then
-        # If a newline is found, echo the buffer to the calling function
-        while read -r task; do
-          echo $task | awk '/[a-zA-Z0-9:-]+/ {print $1}'
-        done <<< "$task_name_buffer"
-        # Empty buffer, because we are done with the tasks
-        task_name_buffer=""
-      fi
-      lines_might_be_tasks=false
-    elif [[ "$lines_might_be_tasks" = true ]]; then
-      task_name_buffer="${task_name_buffer}\n${line}"
+# Looks for a gradlew file in the current working directory
+# or any of its parent directories, and executes it if found.
+# Otherwise it will call gradle directly.
+function gradle-or-gradlew() {
+  # find project root
+  # taken from https://github.com/gradle/gradle-completion
+  local dir="$PWD" project_root="$PWD"
+  while [[ "$dir" != / ]]; do
+    if [[ -f "$dir/settings.gradle" || -f "$dir/settings.gradle.kts" || -f "$dir/gradlew" ]]; then
+      project_root="$dir"
+      break
    fi
-  done <<< "$1"
-}
+    dir="${dir:h}"
+  done

-
-##############
-# Gradle tasks from subprojects are allowed to be executed without specifying
-# the subproject; that task will then be called on all subprojects.
-# gradle(w) tasks --all only lists tasks per subproject, but when autocompleting
-# we often want to be able to run a specific task on all subprojects, e.g.
-# "gradle clean".
-# This function uses the list of tasks from "gradle tasks --all", and for each
-# line grabs everything after the last ":" and combines that output with the original
-# output. The combined list is returned as the result of this function.
-##############
-_gradle_parse_and_extract_tasks () {
-  # All tasks
-  tasks=$(_gradle_parse_tasks "$1")
-  # Task name without sub project(s) prefix
-  simple_tasks=$(echo $tasks | awk 'BEGIN { FS = ":" } { print $NF }')
-  echo "$tasks\n$simple_tasks"
-}
-
-##############################################################################
-# Discover the gradle tasks by running "gradle tasks --all"
-############################################################################
-_gradle_tasks () {
-  if [[ -f build.gradle || -f build.gradle.kts || -f settings.gradle || -f settings.gradle.kts ]]; then
-    _gradle_arguments
-    if _gradle_does_task_list_need_generating; then
-      _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache
-    fi
-    compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache)
+  # if gradlew found, run it instead of gradle
+  if [[ -f "$project_root/gradlew" ]]; then
+    echo "executing gradlew instead of gradle"
+    "$project_root/gradlew" "$@"
+  else
+    command gradle "$@"
  fi
 }

-_gradlew_tasks () {
-  if [[ -f build.gradle || -f build.gradle.kts || -f settings.gradle || -f settings.gradle.kts ]]; then
-    _gradle_arguments
-    if _gradle_does_task_list_need_generating; then
-      _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
-    fi
-    compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache)
-  fi
-}
-
-
-##############################################################################
-# Register the completions against the gradle and gradlew commands
-############################################################################
-compdef _gradle_tasks gradle
-compdef _gradlew_tasks gradlew
-compdef _gradlew_tasks gw
+alias gradle=gradle-or-gradlew
+compdef _gradle gradle-or-gradlew
@@ -1 +0,0 @@
-gradle.plugin.zsh
@@ -1 +0,0 @@
-gradle.plugin.zsh
@@ -14,58 +14,3 @@ It looks for scripts in the following paths:
 - `~/.grails/scripts`
 - `./scripts`
 - `./plugins/*/scripts`
-
-## Grails Commands
- `add-proxy`
- `alias`
- `bootstrap`
- `bug-report`
- `clean`
- `clean-all`
- `clear-proxy`
- `compile`
- `console`
- `create-app`
- `create-controller`
- `create-domain-class`
- `create-filters`
- `create-integration-test`
- `create-multi-project-build`
- `create-plugin`
- `create-pom`
- `create-script`
- `create-service`
- `create-tag-lib`
- `create-unit-test`
- `dependency-report`
- `doc`
- `help`
- `init`
- `install-app-templates`
- `install-dependency`
- `install-plugin`
- `install-templates`
- `integrate-with`
- `interactive`
- `list-plugin-updates`
- `list-plugins`
- `migrate-docs`
- `package`
- `package-plugin`
- `plugin-info`
- `refresh-dependencies`
- `remove-proxy`
- `run-app`
- `run-script`
- `run-war`
- `set-grails-version`
- `set-proxy`
- `set-version`
- `shell`
- `stats`
- `stop-app`
- `test-app`
- `uninstall-plugin`
- `url-mappings-report`
- `war`
- `wrapper`
@@ -1,25 +1,44 @@
-zsh-history-substring-search
-==============================================================================
+# zsh-history-substring-search

 This is a clean-room implementation of the [Fish shell][1]'s history search
-feature, where you can type in any part of any previously entered command
-and press the UP and DOWN arrow keys to cycle through the matching commands.
-You can also use K and J in VI mode or ^P and ^N in EMACS mode for the same.
+feature, where you can type in any part of any command from history and then
+press chosen keys, such as the UP and DOWN arrows, to cycle through matches.

-[1]: https://fishshell.com
-[2]: https://www.zsh.org/mla/users/2009/msg00818.html
-[3]: https://sourceforge.net/projects/fizsh/
-[4]: https://github.com/ohmyzsh/ohmyzsh/pull/215
+[1]: http://fishshell.com
+[2]: http://www.zsh.org/mla/users/2009/msg00818.html
+[3]: http://sourceforge.net/projects/fizsh/
+[4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
 [5]: https://github.com/zsh-users/zsh-history-substring-search
 [6]: https://github.com/zsh-users/zsh-syntax-highlighting

------------------------------------------------------------------------------
+
 Requirements
 ------------------------------------------------------------------------------

 * [ZSH](http://zsh.sourceforge.net) 4.3 or newer

+Install
 ------------------------------------------------------------------------------
+
+Using the [Homebrew]( https://brew.sh ) package manager:
+
+    brew install zsh-history-substring-search
+    echo 'source /usr/local/share/zsh-history-substring-search/zsh-history-substring-search.zsh' >> ~/.zshrc
+
+Using [Oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh):
+
+1. Clone this repository in oh-my-zsh's plugins directory:
+
+        git clone https://github.com/zsh-users/zsh-history-substring-search ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-history-substring-search
+
+2. Activate the plugin in `~/.zshrc`:
+
+        plugins=( [plugins...] history-substring-search)
+
+3. Source `~/.zshrc`  to take changes into account:
+
+        source ~/.zshrc
+
 Usage
 ------------------------------------------------------------------------------

@@ -33,98 +52,128 @@ Usage
        % source zsh-syntax-highlighting.zsh
        % source zsh-history-substring-search.zsh

-2.  Bind keyboard shortcuts to this script's functions:
+2.  Bind keyboard shortcuts to this script's functions.

-        # bind UP and DOWN arrow keys
-        zmodload zsh/terminfo
-        bindkey "$terminfo[kcuu1]" history-substring-search-up
-        bindkey "$terminfo[kcud1]" history-substring-search-down
+    Users typically bind their UP and DOWN arrow keys to this script, thus:
+    * Run `cat -v` in your favorite terminal emulator to observe key codes.
+      (**NOTE:** In some cases, `cat -v` shows the wrong key codes.  If the
+      key codes shown by `cat -v` don't work for you, press `<C-v><UP>` and
+      `<C-v><DOWN>` at your ZSH command line prompt for correct key codes.)
+    * Press the UP arrow key and observe what is printed in your terminal.
+    * Press the DOWN arrow key and observe what is printed in your terminal.
+    * Press the Control and C keys simultaneously to terminate the `cat -v`.
+    * Use your observations from the previous steps to create key bindings.
+      For example, if you observed `^[[A` for UP and `^[[B` for DOWN, then:

-        # bind UP and DOWN arrow keys (compatibility fallback
-        # for Ubuntu 12.04, Fedora 21, and MacOSX 10.9 users)
-        bindkey '^[[A' history-substring-search-up
-        bindkey '^[[B' history-substring-search-down
+          bindkey '^[[A' history-substring-search-up
+          bindkey '^[[B' history-substring-search-down

-        # bind P and N for EMACS mode
-        bindkey -M emacs '^P' history-substring-search-up
-        bindkey -M emacs '^N' history-substring-search-down
+      However, if the observed values don't work, you can try using terminfo:

-        # bind k and j for VI mode
-        bindkey -M vicmd 'k' history-substring-search-up
-        bindkey -M vicmd 'j' history-substring-search-down
+          bindkey "$terminfo[kcuu1]" history-substring-search-up
+          bindkey "$terminfo[kcud1]" history-substring-search-down
+
+      You might also want to bind the Control-P/N keys for use in EMACS mode:
+
+          bindkey -M emacs '^P' history-substring-search-up
+          bindkey -M emacs '^N' history-substring-search-down
+
+      You might also want to bind the `k` and `j` keys for use in VI mode:
+
+          bindkey -M vicmd 'k' history-substring-search-up
+          bindkey -M vicmd 'j' history-substring-search-down

 3.  Type any part of any previous command and then:

-    * Press the UP arrow key to select the nearest command that (1) contains
-      your query and (2) is older than the current command in the command
-      history.
+    * Press the `history-substring-search-up` key, which was configured in
+      step 2 above, to select the nearest command that (1) contains your query
+      and (2) is also older than the current command in your command history.

-    * Press the DOWN arrow key to select the nearest command that (1)
-      contains your query and (2) is newer than the current command in the
-      command history.
+    * Press the `history-substring-search-down` key, which was configured in
+      step 2 above, to select the nearest command that (1) contains your query
+      and (2) is also newer than the current command in your command history.

-    * Press ^U (the Control and U keys simultaneously) to abort the search.
+    * Press `^U` the Control and U keys simultaneously to abort the search.

 4.  If a matching command spans more than one line of text, press the LEFT
    arrow key to move the cursor away from the end of the command, and then:

-    * Press the UP arrow key to move the cursor to the line above.  When the
-      cursor reaches the first line of the command, pressing the UP arrow
-      key again will cause this script to perform another search.
+    * Press the `history-substring-search-up` key, which was configured in
+      step 2 above, to move the cursor to the line above the cursored line.
+      When the cursor reaches the first line of the command, pressing the
+      `history-substring-search-up` key again will cause this script to
+      perform another search.
+
+    * Press the `history-substring-search-down` key, which was configured in
+      step 2 above, to move the cursor to the line below the cursored line.
+      When the cursor reaches the last line of the command, pressing the
+      `history-substring-search-down` key, which was configured in step 2
+      above, again will cause this script to perform another search.

-    * Press the DOWN arrow key to move the cursor to the line below.  When
-      the cursor reaches the last line of the command, pressing the DOWN
-      arrow key again will cause this script to perform another search.

------------------------------------------------------------------------------
 Configuration
 ------------------------------------------------------------------------------

 This script defines the following global variables. You may override their
 default values only after having loaded this script into your ZSH session.

-* HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND is a global variable that defines
+* `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND` is a global variable that defines
  how the query should be highlighted inside a matching command. Its default
  value causes this script to highlight using bold, white text on a magenta
  background. See the "Character Highlighting" section in the zshzle(1) man
  page to learn about the kinds of values you may assign to this variable.

-* HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND is a global variable that
+* `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND` is a global variable that
  defines how the query should be highlighted when no commands in the
  history match it. Its default value causes this script to highlight using
  bold, white text on a red background. See the "Character Highlighting"
  section in the zshzle(1) man page to learn about the kinds of values you
  may assign to this variable.

-* HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS is a global variable that defines
+* `HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS` is a global variable that defines
  how the command history will be searched for your query. Its default value
  causes this script to perform a case-insensitive search. See the "Globbing
  Flags" section in the zshexpn(1) man page to learn about the kinds of
  values you may assign to this variable.

-To always receive _unique_ search results, use `setopt HIST_IGNORE_ALL_DUPS`.
-Alternatively, use `setopt HIST_FIND_NO_DUPS` which makes this plugin skip
-duplicate _adjacent_ search results as you cycle through them---however, this
-does not guarantee that search results are unique: if your search results were
-"Dog", "Dog", "HotDog", "Dog", then cycling them gives "Dog", "HotDog", "Dog".
-Notice that the "Dog" search result appeared twice as you cycled through them!
-If you wish to avoid this limitation, then use `setopt HIST_IGNORE_ALL_DUPS`.
+* `HISTORY_SUBSTRING_SEARCH_FUZZY` is a global variable that defines
+  how the command history will be searched for your query. If set to a non-empty
+  value, causes this script to perform a fuzzy search by words, matching in
+  given order e.g. `ab c` will match `*ab*c*`
+
+* `HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE` is a global variable that defines
+  whether all search results returned are _unique_. If set to a non-empty
+  value, then only unique search results are presented. This behaviour is off
+  by default. An alternative way to ensure that search results are unique is
+  to use `setopt HIST_IGNORE_ALL_DUPS`. If this configuration variable is off
+  and `setopt HIST_IGNORE_ALL_DUPS` is unset, then `setopt HIST_FIND_NO_DUPS`
+  is still respected and it makes this script skip duplicate _adjacent_ search
+  results as you cycle through them, but this does not guarantee that search
+  results are unique: if your search results were "Dog", "Dog", "HotDog",
+  "Dog", then cycling them gives "Dog", "HotDog", "Dog". Notice that the "Dog"
+  search result appeared twice as you cycled through them. If you wish to
+  receive globally unique search results only once, then use this
+  configuration variable, or use `setopt HIST_IGNORE_ALL_DUPS`.
+

------------------------------------------------------------------------------
 History
 ------------------------------------------------------------------------------

-This script was originally written by [Peter Stephenson][2], who published it
-to the ZSH users mailing list (thereby making it public domain) in September
-2009. It was later revised by Guido van Steen and released under the BSD
-license (see below) as part of [the fizsh project][3] in January 2011.
+* September 2009: [Peter Stephenson][2] originally wrote this script and it
+  published to the zsh-users mailing list.

-It was later extracted from fizsh release 1.0.1, refactored heavily, and
-repackaged as both an [oh-my-zsh plugin][4] and as an independently loadable
-[ZSH script][5] by Suraj N. Kurapati in 2011.
+* January 2011: Guido van Steen (@guidovansteen) revised this script and
+  released it under the 3-clause BSD license as part of [fizsh][3], the
+  Friendly Interactive ZSHell.

-It was [further developed][4] by Guido van Steen, Suraj N. Kurapati, Sorin
-Ionescu, and Vincent Guerci in 2011.
+* January 2011: Suraj N. Kurapati (@sunaku) extracted this script from
+  [fizsh][3] 1.0.1, refactored it heavily, and finally repackaged it as an
+  [oh-my-zsh plugin][4] and as an independently loadable [ZSH script][5].
+
+* July 2011: Guido van Steen, Suraj N. Kurapati, and Sorin Ionescu
+  (@sorin-ionescu) [further developed it][4] with Vincent Guerci (@vguerci).
+
+* March 2016: Geza Lore (@gezalore) greatly refactored it in pull request #55.

 ------------------------------------------------------------------------------
 Oh My Zsh Distribution Notes
@@ -138,8 +187,8 @@ https://github.com/zsh-users/zsh-history-substring-search.

 This downstream copy was last updated from the following upstream commit:

-  SHA:          2c295432175990c1bb4e90bc13f609daa67a25d6
-  Commit date:  2015-09-28 10:47:34 -0700
+  SHA:          0f80b8eb3368b46e5e573c1d91ae69eb095db3fb
+  Commit date:  2019-05-12 17:35:54 -0700

 Everything above this section is a copy of the original upstream's README, so things
 may differ slightly when you're using this inside OMZ. In particular, you do not
@@ -1,20 +1,9 @@
-# This file integrates the zsh-history-substring-search script into oh-my-zsh.
-
-source "${0:r:r}.zsh"
-
-if test "$CASE_SENSITIVE" = true; then
-  unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
-fi
-
-if test "$DISABLE_COLOR" = true; then
-  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
-fi
+0=${(%):-%N}
+source ${0:A:h}/history-substring-search.zsh


 # Bind terminal-specific up and down keys
-# Bind in both emacs and vi modes so it works in both, and is not
-# sensitive to whether this is loaded before or after the vi-mode plugin
+
 if [[ -n "$terminfo[kcuu1]" ]]; then
  bindkey -M emacs "$terminfo[kcuu1]" history-substring-search-up
  bindkey -M viins "$terminfo[kcuu1]" history-substring-search-up
@@ -6,6 +6,8 @@
 # Copyright (c) 2011 Suraj N. Kurapati
 # Copyright (c) 2011 Sorin Ionescu
 # Copyright (c) 2011 Vincent Guerci
+# Copyright (c) 2016 Geza Lore
+# Copyright (c) 2017 Bengt Brodersen
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,12 +40,30 @@
 ##############################################################################

 #-----------------------------------------------------------------------------
-# configuration variables
+# declare global configuration variables
 #-----------------------------------------------------------------------------

-HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
-HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
-HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+typeset -g HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+typeset -g HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=''
+typeset -g HISTORY_SUBSTRING_SEARCH_FUZZY=''
+
+#-----------------------------------------------------------------------------
+# declare internal global variables
+#-----------------------------------------------------------------------------
+
+typeset -g BUFFER MATCH MBEGIN MEND CURSOR
+typeset -g _history_substring_search_refresh_display
+typeset -g _history_substring_search_query_highlight
+typeset -g _history_substring_search_result
+typeset -g _history_substring_search_query
+typeset -g -a _history_substring_search_query_parts
+typeset -g -a _history_substring_search_raw_matches
+typeset -g -i _history_substring_search_raw_match_index
+typeset -g -a _history_substring_search_matches
+typeset -g -i _history_substring_search_match_index
+typeset -g -A _history_substring_search_unique_filter

 #-----------------------------------------------------------------------------
 # the main ZLE widgets
@@ -180,62 +200,104 @@ _history-substring-search-begin() {
  _history_substring_search_query_highlight=

  #
-  # Continue using the previous $_history_substring_search_result by default,
-  # unless the current query was cleared or a new/different query was entered.
+  # If the buffer is the same as the previously displayed history substring
+  # search result, then just keep stepping through the match list. Otherwise
+  # start a new search.
  #
-  if [[ -z $BUFFER || $BUFFER != $_history_substring_search_result ]]; then
+  if [[ -n $BUFFER && $BUFFER == ${_history_substring_search_result:-} ]]; then
+    return;
+  fi
+
+  #
+  # Clear the previous result.
+  #
+  _history_substring_search_result=''
+
+  if [[ -z $BUFFER ]]; then
    #
-    # For the purpose of highlighting we will also keep
-    # a version without doubly-escaped meta characters.
+    # If the buffer is empty, we will just act like up-history/down-history
+    # in ZSH, so we do not need to actually search the history. This should
+    # speed things up a little.
+    #
+    _history_substring_search_query=
+    _history_substring_search_query_parts=()
+    _history_substring_search_raw_matches=()
+
+  else
+    #
+    # For the purpose of highlighting we keep a copy of the original
+    # query string.
    #
    _history_substring_search_query=$BUFFER

    #
-    # $BUFFER contains the text that is in the command-line currently.
-    # we put an extra "\\" before meta characters such as "\(" and "\)",
-    # so that they become "\\\(" and "\\\)".
+    # compose search pattern
    #
-    _history_substring_search_query_escaped=${BUFFER//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+    if [[ -n $HISTORY_SUBSTRING_SEARCH_FUZZY ]]; then
+      #
+      # `=` split string in arguments
+      #
+      _history_substring_search_query_parts=(${=_history_substring_search_query})
+    else
+      _history_substring_search_query_parts=(${==_history_substring_search_query})
+    fi

    #
-    # Find all occurrences of the search query in the history file.
+    # Escape and join query parts with wildcard character '*' as seperator
+    # `(j:CHAR:)` join array to string with CHAR as seperator
+    #
+    local search_pattern="*${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
+
+    #
+    # Find all occurrences of the search pattern in the history file.
    #
    # (k) returns the "keys" (history index numbers) instead of the values
-    # (Oa) reverses the order, because (R) returns results reversed.
+    # (R) returns values in reverse older, so the index of the youngest
+    # matching history entry is at the head of the list.
    #
-    _history_substring_search_matches=(${(kOa)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)*${_history_substring_search_query_escaped}*]})
+    _history_substring_search_raw_matches=(${(k)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)${search_pattern}]})
+  fi

-    #
-    # Define the range of values that $_history_substring_search_match_index
-    # can take: [0, $_history_substring_search_matches_count_plus].
-    #
-    _history_substring_search_matches_count=$#_history_substring_search_matches
-    _history_substring_search_matches_count_plus=$(( _history_substring_search_matches_count + 1 ))
-    _history_substring_search_matches_count_sans=$(( _history_substring_search_matches_count - 1 ))
+  #
+  # In order to stay as responsive as possible, we will process the raw
+  # matches lazily (when the user requests the next match) to choose items
+  # that need to be displayed to the user.
+  # _history_substring_search_raw_match_index holds the index of the last
+  # unprocessed entry in _history_substring_search_raw_matches. Any items
+  # that need to be displayed will be added to
+  # _history_substring_search_matches.
+  #
+  # We use an associative array (_history_substring_search_unique_filter) as
+  # a 'set' data structure to ensure uniqueness of the results if desired.
+  # If an entry (key) is in the set (non-empty value), then we have already
+  # added that entry to _history_substring_search_matches.
+  #
+  _history_substring_search_raw_match_index=0
+  _history_substring_search_matches=()
+  _history_substring_search_unique_filter=()

-    #
-    # If $_history_substring_search_match_index is equal to
-    # $_history_substring_search_matches_count_plus, this indicates that we
-    # are beyond the beginning of $_history_substring_search_matches.
-    #
-    # If $_history_substring_search_match_index is equal to 0, this indicates
-    # that we are beyond the end of $_history_substring_search_matches.
-    #
-    # If we have initially pressed "up" we have to initialize
-    # $_history_substring_search_match_index to
-    # $_history_substring_search_matches_count_plus so that it will be
-    # decreased to $_history_substring_search_matches_count.
-    #
-    # If we have initially pressed "down" we have to initialize
-    # $_history_substring_search_match_index to
-    # $_history_substring_search_matches_count so that it will be increased to
-    # $_history_substring_search_matches_count_plus.
-    #
-    if [[ $WIDGET == history-substring-search-down ]]; then
-       _history_substring_search_match_index=$_history_substring_search_matches_count
-    else
-      _history_substring_search_match_index=$_history_substring_search_matches_count_plus
-    fi
+  #
+  # If $_history_substring_search_match_index is equal to
+  # $#_history_substring_search_matches + 1, this indicates that we
+  # are beyond the end of $_history_substring_search_matches and that we
+  # have also processed all entries in
+  # _history_substring_search_raw_matches.
+  #
+  # If $#_history_substring_search_match_index is equal to 0, this indicates
+  # that we are beyond the beginning of $_history_substring_search_matches.
+  #
+  # If we have initially pressed "up" we have to initialize
+  # $_history_substring_search_match_index to 0 so that it will be
+  # incremented to 1.
+  #
+  # If we have initially pressed "down" we have to initialize
+  # $_history_substring_search_match_index to 1 so that it will be
+  # decremented to 0.
+  #
+  if [[ $WIDGET == history-substring-search-down ]]; then
+     _history_substring_search_match_index=1
+  else
+    _history_substring_search_match_index=0
  fi
 }

@@ -255,16 +317,21 @@ _history-substring-search-end() {
  _zsh_highlight

  # highlight the search query inside the command line
-  if [[ -n $_history_substring_search_query_highlight && -n $_history_substring_search_query ]]; then
-    #
-    # The following expression yields a variable $MBEGIN, which
-    # indicates the begin position + 1 of the first occurrence
-    # of _history_substring_search_query_escaped in $BUFFER.
-    #
-    : ${(S)BUFFER##(#m$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)($_history_substring_search_query##)}
-    local begin=$(( MBEGIN - 1 ))
-    local end=$(( begin + $#_history_substring_search_query ))
-    region_highlight+=("$begin $end $_history_substring_search_query_highlight")
+  if [[ -n $_history_substring_search_query_highlight ]]; then
+    # highlight first matching query parts
+    local highlight_start_index=0
+    local highlight_end_index=0
+    local query_part
+    for query_part in $_history_substring_search_query_parts; do
+      local escaped_query_part=${query_part//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+      # (i) get index of pattern
+      local query_part_match_index="${${BUFFER:$highlight_start_index}[(i)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)${escaped_query_part}]}"
+      if [[ $query_part_match_index -le ${#BUFFER:$highlight_start_index} ]]; then
+        highlight_start_index=$(( $highlight_start_index + $query_part_match_index ))
+        highlight_end_index=$(( $highlight_start_index + ${#query_part} ))
+        region_highlight+=("$(($highlight_start_index - 1)) $(($highlight_end_index - 1)) $_history_substring_search_query_highlight")
+      fi
+    done
  fi

  # For debugging purposes:
@@ -378,12 +445,143 @@ _history-substring-search-down-history() {
  return 1
 }

+_history_substring_search_process_raw_matches() {
+  #
+  # Process more outstanding raw matches and append any matches that need to
+  # be displayed to the user to _history_substring_search_matches.
+  # Return whether there were any more results appended.
+  #
+
+  #
+  # While we have more raw matches. Process them to see if there are any more
+  # matches that need to be displayed to the user.
+  #
+  while [[ $_history_substring_search_raw_match_index -lt $#_history_substring_search_raw_matches ]]; do
+    #
+    # Move on to the next raw entry and get its history index.
+    #
+    _history_substring_search_raw_match_index+=1
+    local index=${_history_substring_search_raw_matches[$_history_substring_search_raw_match_index]}
+
+    #
+    # If HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set to a non-empty value,
+    # then ensure that only unique matches are presented to the user.
+    # When HIST_IGNORE_ALL_DUPS is set, ZSH already ensures a unique history,
+    # so in this case we do not need to do anything.
+    #
+    if [[ ! -o HIST_IGNORE_ALL_DUPS && -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+      #
+      # Get the actual history entry at the new index, and check if we have
+      # already added it to _history_substring_search_matches.
+      #
+      local entry=${history[$index]}
+
+      if [[ -z ${_history_substring_search_unique_filter[$entry]} ]]; then
+        #
+        # This is a new unique entry. Add it to the filter and append the
+        # index to _history_substring_search_matches.
+        #
+        _history_substring_search_unique_filter[$entry]=1
+        _history_substring_search_matches+=($index)
+
+        #
+        # Indicate that we did find a match.
+        #
+        return 0
+      fi
+
+    else
+      #
+      # Just append the new history index to the processed matches.
+      #
+      _history_substring_search_matches+=($index)
+
+      #
+      # Indicate that we did find a match.
+      #
+      return 0
+    fi
+
+  done
+
+  #
+  # We are beyond the end of the list of raw matches. Indicate that no
+  # more matches are available.
+  #
+  return 1
+}
+
+_history-substring-search-has-next() {
+  #
+  # Predicate function that returns whether any more older matches are
+  # available.
+  #
+
+  if  [[ $_history_substring_search_match_index -lt $#_history_substring_search_matches ]]; then
+    #
+    # We did not reach the end of the processed list, so we do have further
+    # matches.
+    #
+    return 0
+
+  else
+    #
+    # We are at the end of the processed list. Try to process further
+    # unprocessed matches. _history_substring_search_process_raw_matches
+    # returns whether any more matches were available, so just return
+    # that result.
+    #
+    _history_substring_search_process_raw_matches
+    return $?
+  fi
+}
+
+_history-substring-search-has-prev() {
+  #
+  # Predicate function that returns whether any more younger matches are
+  # available.
+  #
+
+  if [[ $_history_substring_search_match_index -gt 1 ]]; then
+    #
+    # We did not reach the beginning of the processed list, so we do have
+    # further matches.
+    #
+    return 0
+
+  else
+    #
+    # We are at the beginning of the processed list. We do not have any more
+    # matches.
+    #
+    return 1
+  fi
+}
+
+_history-substring-search-found() {
+  #
+  # A match is available. The index of the match is held in
+  # $_history_substring_search_match_index
+  #
+  # 1. Make $BUFFER equal to the matching history entry.
+  #
+  # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+  #    to highlight the current buffer.
+  #
+  BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
+  _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+}
+
 _history-substring-search-not-found() {
  #
-  # Nothing matched the search query, so put it back into the $BUFFER while
-  # highlighting it accordingly so the user can revise it and search again.
+  # No more matches are available.
+  #
+  # 1. Make $BUFFER equal to $_history_substring_search_query so the user can
+  #    revise it and search again.
+  #
+  # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+  #    to highlight the current buffer.
  #
-  _history_substring_search_old_buffer=$BUFFER
  BUFFER=$_history_substring_search_query
  _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
 }
@@ -392,91 +590,84 @@ _history-substring-search-up-search() {
  _history_substring_search_refresh_display=1

  #
-  # Highlight matches during history-substring-up-search:
+  # Select history entry during history-substring-down-search:
  #
-  # The following constants have been initialized in
+  # The following variables have been initialized in
  # _history-substring-search-up/down-search():
  #
-  # $_history_substring_search_matches is the current list of matches
-  # $_history_substring_search_matches_count is the current number of matches
-  # $_history_substring_search_matches_count_plus is the current number of matches + 1
-  # $_history_substring_search_matches_count_sans is the current number of matches - 1
+  # $_history_substring_search_matches is the current list of matches that
+  # need to be displayed to the user.
  # $_history_substring_search_match_index is the index of the current match
+  # that is being displayed to the user.
  #
  # The range of values that $_history_substring_search_match_index can take
-  # is: [0, $_history_substring_search_matches_count_plus].  A value of 0
-  # indicates that we are beyond the end of
+  # is: [0, $#_history_substring_search_matches + 1].  A value of 0
+  # indicates that we are beyond the beginning of
  # $_history_substring_search_matches. A value of
-  # $_history_substring_search_matches_count_plus indicates that we are beyond
-  # the beginning of $_history_substring_search_matches.
+  # $#_history_substring_search_matches + 1 indicates that we are beyond
+  # the end of $_history_substring_search_matches and that we have also
+  # processed all entries in _history_substring_search_raw_matches.
+  #
+  # If $_history_substring_search_match_index equals
+  # $#_history_substring_search_matches and
+  # $_history_substring_search_raw_match_index is not greater than
+  # $#_history_substring_search_raw_matches, then we need to further process
+  # $_history_substring_search_raw_matches to see if there are any more
+  # entries that need to be displayed to the user.
  #
  # In _history-substring-search-up-search() the initial value of
-  # $_history_substring_search_match_index is
-  # $_history_substring_search_matches_count_plus.  This value is set in
-  # _history-substring-search-begin().  _history-substring-search-up-search()
-  # will initially decrease it to $_history_substring_search_matches_count.
+  # $_history_substring_search_match_index is 0. This value is set in
+  # _history-substring-search-begin(). _history-substring-search-up-search()
+  # will initially increment it to 1.
  #
-  if [[ $_history_substring_search_match_index -ge 2 ]]; then
-    #
-    # Highlight the next match:
-    #
-    # 1. Decrease the value of $_history_substring_search_match_index.
-    #
-    # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index-- ))
-    BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
-    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND

-  elif [[ $_history_substring_search_match_index -eq 1 ]]; then
+  if [[ $_history_substring_search_match_index -gt $#_history_substring_search_matches ]]; then
    #
-    # We will move beyond the end of $_history_substring_search_matches:
+    # We are beyond the end of $_history_substring_search_matches. This
+    # can only happen if we have also exhausted the unprocessed matches in
+    # _history_substring_search_raw_matches.
    #
-    # 1. Decrease the value of $_history_substring_search_match_index.
-    #
-    # 2. Save the current buffer in $_history_substring_search_old_buffer,
-    #    so that it can be retrieved by
-    #    _history-substring-search-down-search() later.
-    #
-    # 3. Make $BUFFER equal to $_history_substring_search_query.
-    #
-    # 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index-- ))
-    _history-substring-search-not-found
-
-  elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count_plus ]]; then
-    #
-    # We were beyond the beginning of $_history_substring_search_matches but
-    # UP makes us move back to $_history_substring_search_matches:
-    #
-    # 1. Decrease the value of $_history_substring_search_match_index.
-    #
-    # 2. Restore $BUFFER from $_history_substring_search_old_buffer.
-    #
-    # 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index-- ))
-    BUFFER=$_history_substring_search_old_buffer
-    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-
-  else
-    #
-    # We are at the beginning of history and there are no further matches.
+    # 1. Update display to indicate search not found.
    #
    _history-substring-search-not-found
    return
  fi

+  if _history-substring-search-has-next; then
+    #
+    # We do have older matches.
+    #
+    # 1. Move index to point to the next match.
+    # 2. Update display to indicate search found.
+    #
+    _history_substring_search_match_index+=1
+    _history-substring-search-found
+
+  else
+    #
+    # We do not have older matches.
+    #
+    # 1. Move the index beyond the end of
+    #    _history_substring_search_matches.
+    # 2. Update display to indicate search not found.
+    #
+    _history_substring_search_match_index+=1
+    _history-substring-search-not-found
+  fi
+
  #
  # When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
  # history should be matched, make sure the new and old results are different.
-  # But when HIST_IGNORE_ALL_DUPS is set, ZSH already ensures a unique history.
  #
-  if [[ ! -o HIST_IGNORE_ALL_DUPS && -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
+  # However, if the HIST_IGNORE_ALL_DUPS shell option, or
+  # HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
+  # unique history, so in this case we do not need to do anything.
+  #
+  if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+    return
+  fi
+
+  if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
    #
    # Repeat the current search so that a different (unique) match is found.
    #
@@ -488,92 +679,75 @@ _history-substring-search-down-search() {
  _history_substring_search_refresh_display=1

  #
-  # Highlight matches during history-substring-up-search:
+  # Select history entry during history-substring-down-search:
  #
-  # The following constants have been initialized in
+  # The following variables have been initialized in
  # _history-substring-search-up/down-search():
  #
-  # $_history_substring_search_matches is the current list of matches
-  # $_history_substring_search_matches_count is the current number of matches
-  # $_history_substring_search_matches_count_plus is the current number of matches + 1
-  # $_history_substring_search_matches_count_sans is the current number of matches - 1
+  # $_history_substring_search_matches is the current list of matches that
+  # need to be displayed to the user.
  # $_history_substring_search_match_index is the index of the current match
+  # that is being displayed to the user.
  #
  # The range of values that $_history_substring_search_match_index can take
-  # is: [0, $_history_substring_search_matches_count_plus].  A value of 0
-  # indicates that we are beyond the end of
+  # is: [0, $#_history_substring_search_matches + 1].  A value of 0
+  # indicates that we are beyond the beginning of
  # $_history_substring_search_matches. A value of
-  # $_history_substring_search_matches_count_plus indicates that we are beyond
-  # the beginning of $_history_substring_search_matches.
+  # $#_history_substring_search_matches + 1 indicates that we are beyond
+  # the end of $_history_substring_search_matches and that we have also
+  # processed all entries in _history_substring_search_raw_matches.
  #
  # In _history-substring-search-down-search() the initial value of
-  # $_history_substring_search_match_index is
-  # $_history_substring_search_matches_count.  This value is set in
-  # _history-substring-search-begin().
-  # _history-substring-search-down-search() will initially increase it to
-  # $_history_substring_search_matches_count_plus.
+  # $_history_substring_search_match_index is 1. This value is set in
+  # _history-substring-search-begin(). _history-substring-search-down-search()
+  # will initially decrement it to 0.
  #
-  if [[ $_history_substring_search_match_index -le $_history_substring_search_matches_count_sans ]]; then
-    #
-    # Highlight the next match:
-    #
-    # 1. Increase $_history_substring_search_match_index by 1.
-    #
-    # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index++ ))
-    BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
-    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND

-  elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count ]]; then
+  if [[ $_history_substring_search_match_index -lt 1 ]]; then
    #
-    # We will move beyond the beginning of $_history_substring_search_matches:
+    # We are beyond the beginning of $_history_substring_search_matches.
    #
-    # 1. Increase $_history_substring_search_match_index by 1.
-    #
-    # 2. Save the current buffer in $_history_substring_search_old_buffer, so
-    #    that it can be retrieved by _history-substring-search-up-search()
-    #    later.
-    #
-    # 3. Make $BUFFER equal to $_history_substring_search_query.
-    #
-    # 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index++ ))
-    _history-substring-search-not-found
-
-  elif [[ $_history_substring_search_match_index -eq 0 ]]; then
-    #
-    # We were beyond the end of $_history_substring_search_matches but DOWN
-    # makes us move back to the $_history_substring_search_matches:
-    #
-    # 1. Increase $_history_substring_search_match_index by 1.
-    #
-    # 2. Restore $BUFFER from $_history_substring_search_old_buffer.
-    #
-    # 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-    #    to highlight the current buffer.
-    #
-    (( _history_substring_search_match_index++ ))
-    BUFFER=$_history_substring_search_old_buffer
-    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-
-  else
-    #
-    # We are at the end of history and there are no further matches.
+    # 1. Update display to indicate search not found.
    #
    _history-substring-search-not-found
    return
  fi

+  if _history-substring-search-has-prev; then
+    #
+    # We do have younger matches.
+    #
+    # 1. Move index to point to the previous match.
+    # 2. Update display to indicate search found.
+    #
+    _history_substring_search_match_index+=-1
+    _history-substring-search-found
+
+  else
+    #
+    # We do not have younger matches.
+    #
+    # 1. Move the index beyond the beginning of
+    #    _history_substring_search_matches.
+    # 2. Update display to indicate search not found.
+    #
+    _history_substring_search_match_index+=-1
+    _history-substring-search-not-found
+  fi
+
  #
  # When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
  # history should be matched, make sure the new and old results are different.
-  # But when HIST_IGNORE_ALL_DUPS is set, ZSH already ensures a unique history.
  #
-  if [[ ! -o HIST_IGNORE_ALL_DUPS && -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
+  # However, if the HIST_IGNORE_ALL_DUPS shell option, or
+  # HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
+  # unique history, so in this case we do not need to do anything.
+  #
+  if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+    return
+  fi
+
+  if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
    #
    # Repeat the current search so that a different (unique) match is found.
    #
@@ -1,15 +1,17 @@
-## history
+# history plugin

 Provides a couple of convenient aliases for using the `history` command to examine your command line history.

-### Requirements
+To use it, add `history` to the plugins array in your zshrc file:

-* None.
+```zsh
+plugins=(... history)
+```

-### Usage
+## Aliases

-* If `h` is called, your command history is listed. Equivalent to using `history`
-
-* If `hsi` is called with an argument, a **case insensitive** `grep` search is performed on your command history, looking for commands that match the argument provided
-
-* If `hsi` is called without an argument you will help on `grep` arguments
+| Alias | Command              | Description                                                      |
+|-------|----------------------|------------------------------------------------------------------|
+| `h`   | `history`            | Prints your command history                                      |
+| `hs`  | `history \| grep`    | Use grep to search your command history                          |
+| `hsi` | `history \| grep -i` | Use grep to do a case-insensitive search of your command history |
@@ -1,8 +1,3 @@
 alias h='history'
-
-function hs
-{
-    history | grep $*
-}
-
-alias hsi='hs -i'
+alias hs='history | grep'
+alias hsi='history | grep -i'
@@ -11,5 +11,4 @@ plugins=(... httpie)

 It uses completion from [zsh-completions](https://github.com/zsh-users/zsh-completions).

-
 **Maintainer:** [lululau](https://github.com/lululau)
@@ -1,4 +1,34 @@
-## JHBuild
+# JHBuild
+
+This plugin adds some [JHBuild](https://developer.gnome.org/jhbuild/) aliases.
+
+To use it, add `jhbuild` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... jhbuild)
+```
+
 **Maintainer:** [Miguel Vaello](https://github.com/miguxbe)

-This plugin adds some jhbuild aliases and increase the completion function provided by zsh.
+## Aliases
+
+| Alias   | Command                   |
+|---------|---------------------------|
+| `jh`    | `jhbuild`                 |
+| `jhb`   | `jhbuild build`           |
+| `jhbo`  | `jhbuild buildone`        |
+| `jhckb` | `jhbuild checkbranches`   |
+| `jhckm` | `jhbuild checkmodulesets` |
+| `jhi`   | `jhbuild info`            |
+| `jhl`   | `jhbuild list`            |
+| `jhc`   | `jhbuild clean`           |
+| `jhco`  | `jhbuild cleanone`        |
+| `jhm`   | `jhbuild make`            |
+| `jhr`   | `jhbuild run`             |
+| `jhrd`  | `jhbuild rdepends`        |
+| `jhsd`  | `jhbuild sysdeps`         |
+| `jhu`   | `jhbuild update`          |
+| `jhuo`  | `jhbuild updateone`       |
+| `jhun`  | `jhbuild uninstall`       |
+| `jhsh`  | `jhbuild shell`           |
+| `jht`   | `jhbuild tinderbox`       |
@@ -1,5 +1,6 @@
-# Aliases
-#
+# JHBuild Aliases
+
+# Base
 alias jh='jhbuild'
 # Build
 alias jhb='jhbuild build'
@@ -7,12 +8,14 @@ alias jhbo='jhbuild buildone'
 # Checks
 alias jhckb='jhbuild checkbranches'
 alias jhckm='jhbuild checkmodulesets'
-# Info & list
+# Info & List
 alias jhi='jhbuild info'
 alias jhl='jhbuild list'
 # Clean
 alias jhc='jhbuild clean'
 alias jhco='jhbuild cleanone'
+# Make
+alias jhm='jhbuild make'
 # Run
 alias jhr='jhbuild run'
 # Depends
@@ -23,6 +26,7 @@ alias jhu='jhbuild update'
 alias jhuo='jhbuild updateone'
 # Uninstall
 alias jhun='jhbuild uninstall'
-
-
-
+# Shell
+alias jhsh='jhbuild shell'
+# Tinderbox
+alias jht='jhbuild tinderbox'
@@ -23,6 +23,9 @@ jira reported [username]  # queries for issues reported by a user
 jira assigned [username]  # queries for issues assigned to a user
 jira myissues   # queries for you own issues
 jira branch     # opens an existing issue matching the current branch name
+                # The branch name may have prefixes ending in "/": "feature/MP-1234",
+                # and also suffixes starting with "_": "MP-1234_fix_dashboard"
+                # In both these cases, the issue opened will be "MP-1234"
 jira ABC-123    # opens an existing issue
 jira ABC-123 m  # opens an existing issue for adding a comment
 ```
@@ -63,25 +63,33 @@ function jira() {
  else
    # Anything that doesn't match a special action is considered an issue name
    # but `branch` is a special case that will parse the current git branch
+    local issue_arg issue
    if [[ "$action" == "branch" ]]; then
-      local issue_arg=$(git rev-parse --abbrev-ref HEAD)
-      local issue="${jira_prefix}${issue_arg}"
+      # Get name of the branch
+      issue_arg=$(git rev-parse --abbrev-ref HEAD)
+      # Strip prefixes like feature/ or bugfix/
+      issue_arg=${issue_arg##*/}
+      # Strip suffixes starting with _
+      issue_arg=(${(s:_:)issue_arg})
+      issue_arg=${issue_arg[1]}
+      if [[ "$issue_arg" = ${jira_prefix}* ]]; then
+        issue="${issue_arg}"
+      else
+        issue="${jira_prefix}${issue_arg}"
+      fi
    else
-      local issue_arg=$action
-      local issue="${jira_prefix}${issue_arg}"
+      issue_arg=${(U)action}
+      issue="${jira_prefix}${issue_arg}"
    fi
-    local url_fragment=''
+
+    local url_fragment
    if [[ "$2" == "m" ]]; then
      url_fragment="#add-comment"
      echo "Add comment to issue #$issue"
    else
      echo "Opening issue #$issue"
    fi
-    if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      open_command "${jira_url}/issues/${issue}${url_fragment}"
-    else
-      open_command "${jira_url}/browse/${issue}${url_fragment}"
-    fi
+    open_command "${jira_url}/browse/${issue}${url_fragment}"
  fi
 }

@@ -2,40 +2,46 @@

 Handy command line tools for dealing with json data.

-## Tools
+To use it, add `jsontools` to the plugins array in your zshrc file:

- **pp_json** - pretty prints json
- **is_json** - returns true if valid json; false otherwise
- **urlencode_json** - returns a url encoded string for the given json 
- **urldecode_json** - returns decoded json for the given url encoded string
+```zsh
+plugins=(... jsontools)
+```

 ## Usage
-Usage is simple...just take your json data and pipe it into the appropriate jsontool.
-```sh
-<json data> | <jsontools tool>
-```
-## Examples

-##### pp_json
+Usage is simple... just take your json data and pipe it into the appropriate jsontool:
+
+- `pp_json`: pretty prints json.
+- `is_json`: returns true if valid json; false otherwise.
+- `urlencode_json`: returns a url encoded string for the given json.
+- `urldecode_json`: returns decoded json for the given url encoded string.
+
+### Examples
+
+- **pp_json**:

 ```sh
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
 ```

-##### is_json
+- **is_json**:
+
 ```sh
 # pretty print the contents of an existing json file
 less data.json | is_json
 ```

-##### urlencode_json
+- **urlencode_json**:
+
 ```sh
 # json data directly from the command line
 echo '{"b":2, "a":1}' | urlencode_json
 ```

-##### urldecode_json
+- **urldecode_json**:
+
 ```sh
 # url encoded string to decode
 echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
@@ -17,3 +17,15 @@ plugins=(... jump)
 | `mark [mark-name]`   | Create a mark with the given name or with the name of the current directory if none is provided |
 | `unmark <mark-name>` | Remove the given mark                                                                           |
 | `marks`              | List the existing marks and the directories they point to                                       |
+
+## Key bindings
+
+Pressing `CTRL`+`G` substitutes the written mark name for the full path of the mark.
+For example, with a mark named `mymark` pointing to `/path/to/my/mark`:
+```zsh
+$ cp /tmp/file mymark<C-g>
+```
+will become:
+```zsh
+$ cp /tmp/file /path/to/my/mark
+```
@@ -9,33 +9,34 @@
 export MARKPATH=$HOME/.marks

 jump() {
-	cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
+	builtin cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
 }

 mark() {
-	if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then
-		MARK=$(basename "$PWD")
+	if [[ $# -eq 0 || "$1" = "." ]]; then
+		MARK=${PWD:t}
 	else
 		MARK="$1"
 	fi
-	if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -sfn "$PWD" "$MARKPATH/$MARK"
+	if read -q "?Mark $PWD as ${MARK}? (y/n) "; then
+		command mkdir -p "$MARKPATH"
+		command ln -sfn "$PWD" "$MARKPATH/$MARK"
 	fi
 }

 unmark() {
-	rm -i "$MARKPATH/$1"
+	LANG= command rm -i "$MARKPATH/$1"
 }

 marks() {
-	local max=0
-	for link in $MARKPATH/*(@); do
+	local link max=0
+	for link in $MARKPATH/{,.}*(@N); do
 		if [[ ${#link:t} -gt $max ]]; then
 			max=${#link:t}
 		fi
 	done
 	local printf_markname_template="$(printf -- "%%%us " "$max")"
-	for link in $MARKPATH/*(@); do
+	for link in $MARKPATH/{,.}*(@N); do
 		local markname="$fg[cyan]${link:t}$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
 		printf -- "$printf_markname_template" "$markname"
@@ -44,21 +45,15 @@ marks() {
 }

 _completemarks() {
-	if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
-		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
-	else
-		if readlink -e "${MARKPATH}"/* &>/dev/null; then
-			reply=($(ls "${MARKPATH}"))
-		fi
-	fi
+	reply=("${MARKPATH}"/{,.}*(@N:t))
 }
 compctl -K _completemarks jump
 compctl -K _completemarks unmark

 _mark_expansion() {
-	setopt extendedglob
+	setopt localoptions extendedglob
 	autoload -U modify-current-argument
-	modify-current-argument '$(readlink "$MARKPATH/$ARG")'
+	modify-current-argument '$(readlink "$MARKPATH/$ARG" || echo "$ARG")'
 }
 zle -N _mark_expansion
 bindkey "^g" _mark_expansion
@@ -1,3 +1,6 @@
+# Define SHORT_HOST if not defined (%m = host name up to first .)
+SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
+
 function _start_agent() {
 	local agents
 	local -a identities
@@ -67,7 +67,7 @@ _kitchen() {
 _kitchen_commands() {
  local commands

-  commands=("${(@f)$(_call_program commands $service help | sed -n 's/^  kitchen \([[:alpha:]]*\) [ [].*# \(.*\)$/\1:\2/p')}")
+  commands=("${(@f)$(_call_program commands $service help | sed -n 's/^  kitchen \([[:alpha:]]*\) [ A-Z[].*# \(.*\)$/\1:\2/p')}")
  _describe -t commands 'kitchen commands' commands
 }

@@ -34,7 +34,7 @@ _knife() {

  case $state in
  knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload vault windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search solo ssh status upload vault windows $cloudproviders
    ;;
  knifesubcmd)
    case $words[2] in
@@ -65,6 +65,9 @@ _knife() {
    role)
      compadd -Q "$@" "bulk delete" create delete edit "from file" list show
      ;;
+    solo)
+      compadd "$@" bootstrap clean cook init prepare
+      ;;
    upload)
      _arguments '*:file or directory:_files -g "*"'
      ;;
@@ -102,6 +105,12 @@ _knife() {
    bag)
      compadd -Q "$@" show edit list "from file" create delete
      ;;
+    bootstrap|clean|cook|prepare)
+      compadd "$@" nodes/*.json(N:t:r)
+      ;;
+    init)
+      compadd "$@" ./*(/N:t)
+      ;;
    *)
      _arguments '3:Subsubcommands:($(_knife_options2))'
      ;;
--- a/Show More
+++ b/Show More