Cleanup

Bind Ctrl+Left to emacs-backward-word (and Right to forward)
Binds some additional sequences to emacs-backward-word and emacs-forward-word. The problem is that terminfo doesn't know about Ctrl+ArrowKeys, so one has to resort to using raw sequences as used in the wild. The sequences were copied from Debian's /etc/inputrc (readline configuration), so they should be fairly portable. It works in xterm and rxvt terminals and doesn't work on TERM=linux (virtual console) as Ctrl+Arrows send the same sequence as Arrows alone. http://zshwiki.org/home/zle/bindkeys http://sources.debian.net/src/readline6/6.2+dfsg-0.1/debian/inputrc?hl=44#L44
2025-07-01 11:39:26 +00:00 · 2014-10-07 19:34:24 -04:00 · 2014-10-07 00:41:36 -04:00
151 changed files with 304 additions and 1002 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -7,12 +7,3 @@
 [submodule "modules/completion/external"]
 	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
-[submodule "modules/prompt/external/powerline"]
-	path = modules/prompt/external/powerline
-	url = https://github.com/davidjrice/prezto_powerline.git
-[submodule "modules/prompt/external/agnoster"]
-	path = modules/prompt/external/agnoster
-	url = https://gist.github.com/3712874.git
-[submodule "modules/prompt/functions/pure"]
-	path = modules/prompt/external/pure
-	url = https://github.com/sindresorhus/pure.git
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -39,3 +39,4 @@ improve its performance, do not hesitate to fork and send pull requests.
 [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [4]: https://help.github.com/articles/using-pull-requests
 [5]: http://daringfireball.net/projects/markdown/syntax#img
+
--- a/README.md
+++ b/README.md
@ -86,8 +86,7 @@ License
 (The MIT License)

 Copyright (c) 2009-2011 Robby Russell and contributors.
-
-Copyright (c) 2011-2015 Sorin Ionescu and contributors.
+Copyright (c) 2011-2014 Sorin Ionescu and contributors.

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@ -108,10 +107,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 [1]: http://www.zsh.org
-[2]: http://i.imgur.com/nrGV6pg.png "sorin theme"
+[2]: http://i.imgur.com/nBEEZ.png "sorin theme"
 [3]: http://git-scm.com
 [4]: https://github.com
 [5]: http://gitimmersion.com
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
+
--- a/init.zsh
+++ b/init.zsh
@ -111,3 +111,4 @@ unset zfunction{s,}
 zstyle -a ':prezto:load' pmodule 'pmodules'
 pmodload "$pmodules[@]"
 unset pmodules
+
--- a/modules/README.md
+++ b/modules/README.md
@ -26,11 +26,6 @@ Directory

 Sets directory options and defines directory aliases.

-DNF
---
-
-Defines dnf aliases.
-
 Dpkg
 ----

@ -97,7 +92,7 @@ Homebrew

 Defines Homebrew aliases.

-MacPorts
+Macports
 --------

 Defines MacPorts aliases and adds MacPorts directories to path variables.
@ -197,3 +192,4 @@ Yum
 ---

 Defines yum aliases.
+
--- a/modules/archive/README.md
+++ b/modules/archive/README.md
@ -38,3 +38,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/archive/functions/_lsarchive
+++ b/modules/archive/functions/_lsarchive
@ -11,3 +11,4 @@
 _arguments \
  '(-v --verbose)'{-v,--remove}'[verbose archive listing]' \
  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z)(-.)'" && return 0
+
--- a/modules/archive/functions/_unarchive
+++ b/modules/archive/functions/_unarchive
@ -11,3 +11,4 @@
 _arguments \
  '(-r --remove)'{-r,--remove}'[remove archive]' \
  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
+
--- a/modules/archive/functions/lsarchive
+++ b/modules/archive/functions/lsarchive
@ -30,7 +30,7 @@ while (( $# > 0 )); do
    continue
  fi

-  case "$1:l" in
+  case "$1" in
    (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
    (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
    (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@ -46,10 +46,11 @@ while (( $# > 0 )); do
      || rar ${${verbose:+v}:-l} "$1" ;;
    (*.7z) 7za l "$1" ;;
    (*)
-      print "$0: cannot list: $1" >&2
+			print "$0: cannot list: $1" >&2
      success=1
    ;;
  esac

  shift
 done
+
--- a/modules/archive/functions/unarchive
+++ b/modules/archive/functions/unarchive
@ -37,7 +37,7 @@ while (( $# > 0 )); do
  success=0
  file_name="${1:t}"
  extract_dir="${file_name:r}"
-  case "$1:l" in
+  case "$1" in
    (*.tar.gz|*.tgz) tar xvzf "$1" ;;
    (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
    (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@ -76,3 +76,4 @@ while (( $# > 0 )); do
  (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
  shift
 done
+
--- a/modules/command-not-found/README.md
+++ b/modules/command-not-found/README.md
@ -13,3 +13,4 @@ Authors

 [1]: https://code.launchpad.net/command-not-found
 [2]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/command-not-found/init.zsh
+++ b/modules/command-not-found/init.zsh
@ -15,3 +15,4 @@ elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
 else
  return 1
 fi
+
--- a/modules/completion/README.md
+++ b/modules/completion/README.md
@ -21,3 +21,4 @@ Authors

 [1]: https://github.com/zsh-users/zsh-completions
 [2]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/completion/external
+++ b/modules/completion/external
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@ -24,7 +24,7 @@ autoload -Uz compinit && compinit -i
 setopt COMPLETE_IN_WORD    # Complete from both ends of a word.
 setopt ALWAYS_TO_END       # Move cursor to the end of a completed word.
 setopt PATH_DIRS           # Perform path search even on command names with slashes.
-setopt AUTO_MENU           # Show completion menu on a successive tab press.
+setopt AUTO_MENU           # Show completion menu on a succesive tab press.
 setopt AUTO_LIST           # Automatically list choices on ambiguous completion.
 setopt AUTO_PARAM_SLASH    # If completed parameter is a directory, add a trailing slash.
 unsetopt MENU_COMPLETE     # Do not autoselect the first completion entry.
@ -34,7 +34,7 @@ unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 # Styles
 #

-# Use caching to make completion for commands such as dpkg and apt usable.
+# Use caching to make completion for cammands such as dpkg and apt usable.
 zstyle ':completion::complete:*' use-cache on
 zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"

@ -116,7 +116,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'

 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $LOGNAME -o pid,user,command -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always
@ -146,3 +146,4 @@ zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hos
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*'
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
+
--- a/modules/directory/README.md
+++ b/modules/directory/README.md
@ -33,3 +33,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/directory/init.zsh
+++ b/modules/directory/init.zsh
@ -28,3 +28,4 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.

 alias d='dirs -v'
 for index ({1..9}) alias "$index"="cd +${index}"; unset index
+
--- a/modules/dnf/README.md
+++ b/modules/dnf/README.md
@ -1,29 +0,0 @@
-DNF
-===
-
-Defines [dnf][1] aliases.
-
-Aliases
-------
-
-  - `dnfc` removes package(s) and leaves.
-  - `dnfi` installs package(s).
-  - `dnfh` displays history.
-  - `dnfl` lists packages.
-  - `dnfL` lists installed packages.
-  - `dnfq` displays package information.
-  - `dnfr` removes package(s).
-  - `dnfs` searches for a package.
-  - `dnfu` updates packages.
-  - `dnfU` upgrates packages.
-
-Authors
-------
-
-*The authors of this module should be contacted via the [issue tracker][2].*
-
-  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-
-[1]: https://fedoraproject.org/wiki/Features/DNF
-[2]: https://github.com/sorin-ionescu/prezto/issues
-
--- a/modules/dnf/init.zsh
+++ b/modules/dnf/init.zsh
@ -1,28 +0,0 @@
-#
-# Defines dnf aliases.
-#
-# Authors:
-#   FireWave <firewave@free.fr>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-# Return if requirements are not found.
-if (( ! $+commands[dnf] )); then
-  return 1
-fi
-
-#
-# Aliases
-#
-
-alias dnfc='sudo dnf clean all'    # Cleans the cache.
-alias dnfh='dnf history'           # Displays history.
-alias dnfi='sudo dnf install'      # Installs package(s).
-alias dnfl='dnf list'              # Lists packages.
-alias dnfL='dnf list installed'    # Lists installed packages.
-alias dnfq='dnf info'              # Displays package information.
-alias dnfr='sudo dnf remove'       # Removes package(s).
-alias dnfs='dnf search'            # Searches for a package.
-alias dnfu='sudo dnf update'       # Updates packages.
-alias dnfU='sudo dnf upgrade'      # Upgrades packages.
-
--- a/modules/dpkg/README.md
+++ b/modules/dpkg/README.md
@ -39,3 +39,4 @@ Authors

 [1]: http://wiki.debian.org/Teams/Dpkg
 [2]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/dpkg/functions/deb-clone
+++ b/modules/dpkg/functions/deb-clone
@ -23,3 +23,4 @@ rm "$clone_script"
 print '#!/bin/sh\n' > "$clone_script"
 print "aptitude install ${package_list}\n" >> "$clone_script"
 chmod +x "$clone_script"
+
--- a/modules/dpkg/functions/deb-history
+++ b/modules/dpkg/functions/deb-history
@ -34,3 +34,4 @@ Commands:
 EOF
  ;;
 esac
+
--- a/modules/dpkg/functions/deb-kbuild
+++ b/modules/dpkg/functions/deb-kbuild
@ -12,3 +12,4 @@ MAKEFLAGS='' time fakeroot make-kpkg \
  --revision "$(date +"%Y%m%d")" \
  kernel_image \
  kernel_headers
+
--- a/modules/dpkg/init.zsh
+++ b/modules/dpkg/init.zsh
@ -55,3 +55,4 @@ alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'

 # Removes all kernel images and headers, except for the ones in use.
 alias deb-kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))"'
+
--- a/modules/editor/README.md
+++ b/modules/editor/README.md
@ -59,3 +59,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@ -28,37 +28,46 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 zmodload zsh/terminfo
 typeset -gA key_info
 key_info=(
-  'Control'      '\C-'
-  'ControlLeft'  '\e[1;5D \e[5D \e\e[D \eOd'
-  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
-  'Escape'       '\e'
-  'Meta'         '\M-'
-  'Backspace'    "^?"
-  'Delete'       "^[[3~"
-  'F1'           "$terminfo[kf1]"
-  'F2'           "$terminfo[kf2]"
-  'F3'           "$terminfo[kf3]"
-  'F4'           "$terminfo[kf4]"
-  'F5'           "$terminfo[kf5]"
-  'F6'           "$terminfo[kf6]"
-  'F7'           "$terminfo[kf7]"
-  'F8'           "$terminfo[kf8]"
-  'F9'           "$terminfo[kf9]"
-  'F10'          "$terminfo[kf10]"
-  'F11'          "$terminfo[kf11]"
-  'F12'          "$terminfo[kf12]"
-  'Insert'       "$terminfo[kich1]"
-  'Home'         "$terminfo[khome]"
-  'PageUp'       "$terminfo[kpp]"
-  'End'          "$terminfo[kend]"
-  'PageDown'     "$terminfo[knp]"
-  'Up'           "$terminfo[kcuu1]"
-  'Left'         "$terminfo[kcub1]"
-  'Down'         "$terminfo[kcud1]"
-  'Right'        "$terminfo[kcuf1]"
-  'BackTab'      "$terminfo[kcbt]"
+  'Control'   '\C-'
+  'Escape'    '\e'
+  'Meta'      '\M-'
+  'Backspace' "^?"
+  'Delete'    "^[[3~"
+  'F1'        "$terminfo[kf1]"
+  'F2'        "$terminfo[kf2]"
+  'F3'        "$terminfo[kf3]"
+  'F4'        "$terminfo[kf4]"
+  'F5'        "$terminfo[kf5]"
+  'F6'        "$terminfo[kf6]"
+  'F7'        "$terminfo[kf7]"
+  'F8'        "$terminfo[kf8]"
+  'F9'        "$terminfo[kf9]"
+  'F10'       "$terminfo[kf10]"
+  'F11'       "$terminfo[kf11]"
+  'F12'       "$terminfo[kf12]"
+  'Insert'    "$terminfo[kich1]"
+  'Home'      "$terminfo[khome]"
+  'PageUp'    "$terminfo[kpp]"
+  'End'       "$terminfo[kend]"
+  'PageDown'  "$terminfo[knp]"
+  'Up'        "$terminfo[kcuu1]"
+  'Left'      "$terminfo[kcub1]"
+  'Down'      "$terminfo[kcud1]"
+  'Right'     "$terminfo[kcuf1]"
+  'BackTab'   "$terminfo[kcbt]"
 )

+# Escape sequences from Debian's inputrc.
+key_info+=(
+  'ControlLeft' '\e[1;5D \e[5D \e\e[D \eOd'
+  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
+)
+
+# if [[ "$TERM" == rxvt* ]]; then
+#   key_info[ControlLeft]+=' \eOd'
+#   key_info[ControlRight]+=' \eOc'
+# fi
+
 # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
 # bindkey failure.
 for key in "${(k)key_info[@]}"; do
@ -327,3 +336,4 @@ else
 fi

 unset key{,map,bindings}
+
--- a/modules/environment/README.md
+++ b/modules/environment/README.md
@ -23,3 +23,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/environment/init.zsh
+++ b/modules/environment/init.zsh
@ -33,6 +33,15 @@ unsetopt BG_NICE          # Don't run all background jobs at a lower priority.
 unsetopt HUP              # Don't kill jobs on shell exit.
 unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.

+#
+# Grep
+#
+
+if zstyle -t ':prezto:environment:grep' color; then
+  export GREP_COLOR='37;45'
+  export GREP_OPTIONS='--color=auto'
+fi
+
 #
 # Termcap
 #
@ -46,3 +55,4 @@ if zstyle -t ':prezto:environment:termcap' color; then
  export LESS_TERMCAP_ue=$'\E[0m'          # Ends underline.
  export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
 fi
+
--- a/modules/fasd/README.md
+++ b/modules/fasd/README.md
@ -36,3 +36,4 @@ Authors
 [3]: https://github.com/rupa/z
 [4]: https://github.com/rupa/v
 [5]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/fasd/init.zsh
+++ b/modules/fasd/init.zsh
@ -51,3 +51,4 @@ function fasd_cd {

 # Changes the current working directory interactively.
 alias j='fasd_cd -i'
+
--- a/modules/git/README.md
+++ b/modules/git/README.md
@ -332,3 +332,4 @@ Authors
 [6]: https://github.com/sorin-ionescu/prezto/issues
 [7]: https://github.com/sorin-ionescu/prezto/issues/219
 [8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
+
--- a/modules/git/alias.zsh
+++ b/modules/git/alias.zsh
@ -100,12 +100,12 @@ alias gix='git rm -r --cached'
 alias giX='git rm -rf --cached'

 # Log (l)
-alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
-alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
-alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
-alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
-alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
-alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
+alias gl='git log --topo-order --pretty=format:${_git_log_medium_format}'
+alias gls='git log --topo-order --stat --pretty=format:${_git_log_medium_format}'
+alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:${_git_log_medium_format}'
+alias glo='git log --topo-order --pretty=format:${_git_log_oneline_format}'
+alias glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
+alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
 alias glc='git shortlog --summary --numbered'

 # Merge (m)
@ -179,3 +179,4 @@ alias gwc='git clean -n'
 alias gwC='git clean -f'
 alias gwx='git rm -r'
 alias gwX='git rm -rf'
+
--- a/modules/git/functions/_git-hub-browse
+++ b/modules/git/functions/_git-hub-browse
@ -45,3 +45,4 @@ case "$state" in
 esac

 return $ret
+
--- a/modules/git/functions/_git-hub-shorten-url
+++ b/modules/git/functions/_git-hub-shorten-url
@ -9,3 +9,4 @@
 #

 _arguments '1:url:' && return 0
+
--- a/modules/git/functions/_git-info
+++ b/modules/git/functions/_git-info
@ -16,3 +16,4 @@ _arguments "1:toggle:((
  on\:'enable in-prompt information for the current repository'
  off\:'disable in-prompt information for the current repository'
 ))" && return 0
+
--- a/modules/git/functions/_git-submodule-move
+++ b/modules/git/functions/_git-submodule-move
@ -38,3 +38,4 @@ case "$state" in
 esac

 return $ret
+
--- a/modules/git/functions/_git-submodule-remove
+++ b/modules/git/functions/_git-submodule-remove
@ -24,3 +24,4 @@ done < <(
 )

 _describe -t submodule 'submodules' submodules && return 0
+
--- a/modules/git/functions/git-branch-current
+++ b/modules/git/functions/git-branch-current
@ -18,3 +18,4 @@ if [[ -n "$ref" ]]; then
 else
  return 1
 fi
+
--- a/modules/git/functions/git-commit-lost
+++ b/modules/git/functions/git-commit-lost
@ -18,3 +18,4 @@ git fsck 2> /dev/null \
      --no-walk \
      --stdin \
      --pretty=format:${_git_log_oneline_format}
+
--- a/modules/git/functions/git-dir
+++ b/modules/git/functions/git-dir
@ -14,3 +14,4 @@ else
  print "$0: not a repository: $PWD" >&2
  return 1
 fi
+
--- a/modules/git/functions/git-hub-browse
+++ b/modules/git/functions/git-hub-browse
@ -56,3 +56,4 @@ else
  print "$0: not a Git repository or remote not set" >&2
  return 1
 fi
+
--- a/modules/git/functions/git-hub-shorten-url
+++ b/modules/git/functions/git-hub-shorten-url
@ -20,3 +20,4 @@ if (( $+commands[curl] )); then
 else
  print "$0: command not found: curl" >&2
 fi
+
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@ -421,3 +421,4 @@ function git-info {
 }

 git-info "$@"
+
--- a/modules/git/functions/git-root
+++ b/modules/git/functions/git-root
@ -14,3 +14,4 @@ else
  print "$0: not a repository work tree: $PWD" >&2
  return 1
 fi
+
--- a/modules/git/functions/git-stash-clear-interactive
+++ b/modules/git/functions/git-stash-clear-interactive
@ -20,3 +20,4 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
    fi
  fi
 fi
+
--- a/modules/git/functions/git-stash-dropped
+++ b/modules/git/functions/git-stash-dropped
@ -20,3 +20,4 @@ git fsck --unreachable 2> /dev/null \
      --merges \
      --no-walk \
      --stdin
+
--- a/modules/git/functions/git-stash-recover
+++ b/modules/git/functions/git-stash-recover
@ -16,3 +16,4 @@ for commit in "$@"; do
  git update-ref \
    -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
 done
+
--- a/modules/git/functions/git-submodule-move
+++ b/modules/git/functions/git-submodule-move
@ -30,3 +30,4 @@ git-submodule-remove "$src"
 git submodule add "$url" "$dst"

 return 0
+
--- a/modules/git/functions/git-submodule-remove
+++ b/modules/git/functions/git-submodule-remove
@ -25,3 +25,4 @@ rm -rf "${1}"
 rm -rf "$(git-dir)/modules/${1}"

 return 0
+
--- a/modules/git/init.zsh
+++ b/modules/git/init.zsh
@ -15,3 +15,4 @@ pmodload 'helper'

 # Source module files.
 source "${0:h}/alias.zsh"
+
--- a/modules/gnu-utility/README.md
+++ b/modules/gnu-utility/README.md
@ -1,7 +1,7 @@
 GNU Utility
 ===========

-Provides for the interactive use of GNU utilities on BSD systems.
+Provides for the interactive use of GNU utilities on non-GNU systems.

 Installing GNU utilities on non-GNU systems in `$PATH` without a prefix, i.e.
 `ls` instead of `gls`, is not recommended since scripts that target other
@ -30,3 +30,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/gnu-utility/init.zsh
+++ b/modules/gnu-utility/init.zsh
@ -58,3 +58,4 @@ for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
 done

 unset _gnu_utility_{p,cmds,cmd,pcmd}
+
--- a/modules/gpg/README.md
+++ b/modules/gpg/README.md
@ -24,3 +24,4 @@ Authors
 [1]: http://www.gnupg.org
 [2]: http://linux.die.net/man/1/gpg-agent
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@ -11,16 +11,16 @@ if (( ! $+commands[gpg-agent] )); then
 fi

 # Set the default paths to gpg-agent files.
-_gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
+_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"

 # Start gpg-agent if not started.
-if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]]; then
+if [[ -z "$GPG_AGENT_INFO" ]]; then
  # Export environment variables.
  source "$_gpg_agent_env" 2> /dev/null

  # Start gpg-agent if not started.
-  if ! ps -U "$LOGNAME" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
+  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
    eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
  fi
 fi
@ -35,12 +35,6 @@ if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then

  # Load the SSH module for additional processing.
  pmodload 'ssh'
-
-  # Updates the GPG-Agent TTY before every command since SSH does not set it.
-  function _gpg-agent-update-tty {
-    gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null
-  }
-  add-zsh-hook preexec _gpg-agent-update-tty
 fi

 # Clean up.
@ -50,3 +44,4 @@ unset _gpg_agent_{conf,env}
 if [[ -n "$SSH_CONNECTION" ]]; then
  export PINENTRY_USER_DATA='USE_CURSES=1'
 fi
+
--- a/modules/haskell/README.md
+++ b/modules/haskell/README.md
@ -26,3 +26,4 @@ Authors

 [1]: http://www.haskell.org/cabal/
 [2]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/helper/README.md
+++ b/modules/helper/README.md
@ -22,3 +22,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/helper/functions/add-zsh-trap
+++ b/modules/helper/functions/add-zsh-trap
@ -39,3 +39,4 @@ function add-zsh-trap {
 }

 add-zsh-trap "$@"
+
--- a/modules/helper/init.zsh
+++ b/modules/helper/init.zsh
@ -29,3 +29,4 @@ function coalesce {
  done
  return 1
 }
+
--- a/modules/history-substring-search/README.md
+++ b/modules/history-substring-search/README.md
@ -59,3 +59,4 @@ Authors
 [1]: https://github.com/zsh-users/zsh-history-substring-search
 [2]: http://fishshell.com
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@ -55,3 +55,4 @@ if [[ -n "$key_info" ]]; then
    bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
  done
 fi
+
--- a/modules/history/README.md
+++ b/modules/history/README.md
@ -41,3 +41,4 @@ Authors

 [1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
 [2]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/homebrew/README.md
+++ b/modules/homebrew/README.md
@ -6,32 +6,21 @@ Defines Homebrew aliases.
 Aliases
 -------

-### Homebrew
-
  - `brewc` cleans outdated brews and their cached archives.
  - `brewC` cleans outdated brews, including keg-only, and their cached archives.
  - `brewi` installs a formula.
  - `brewl` lists installed formulae.
  - `brews` searches for a formula.
-  - `brewu` updates Homebrew and formulae.
+  - `brewU` upgrades Homebrew and outdated brews.
+  - `brewu` upgrades Homebrew.
  - `brewx` uninstalls a formula.

-### Homebrew Cask
-
-  - `cask` is aliased to `brew cask`.
-  - `caskc` cleans up old cached downloads.
-  - `caskC` cleans up all cached downloads.
-  - `caski` installs a cask.
-  - `caskl` lists installed casks.
-  - `casks` searches for a cask.
-  - `caskx` uninstalls a cask.
-
 Authors
 -------

 *The authors of this module should be contacted via the [issue tracker][1].*

  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-  - [Griffin Yourick](https://github.com/tough-griff)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/homebrew/init.zsh
+++ b/modules/homebrew/init.zsh
@ -6,7 +6,7 @@
 #

 # Return if requirements are not found.
-if [[ "$OSTYPE" != (darwin|linux)* ]]; then
+if [[ "$OSTYPE" != darwin* ]]; then
  return 1
 fi

@ -14,20 +14,12 @@ fi
 # Aliases
 #

-# Homebrew
 alias brewc='brew cleanup'
 alias brewC='brew cleanup --force'
 alias brewi='brew install'
 alias brewl='brew list'
 alias brews='brew search'
-alias brewu='brew update && brew upgrade --all'
+alias brewu='brew upgrade'
+alias brewU='brew update && brew upgrade'
 alias brewx='brew remove'

-# Homebrew Cask
-alias cask='brew cask'
-alias caskc='brew cask cleanup --outdated'
-alias caskC='brew cask cleanup'
-alias caski='brew cask install'
-alias caskl='brew cask list'
-alias casks='brew cask search'
-alias caskx='brew cask uninstall'
--- a/modules/macports/README.md
+++ b/modules/macports/README.md
@ -1,4 +1,4 @@
-MacPorts
+Macports
 ========

 Defines MacPorts aliases and adds MacPorts directories to path variables.
@ -23,3 +23,4 @@ Authors
  - [Sorin Ionescu](https://github.com/sorin-ionescu)

 [1]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/macports/init.zsh
+++ b/modules/macports/init.zsh
@ -32,3 +32,4 @@ alias portU='sudo port selfupdate && sudo port upgrade outdated'
 alias portu='sudo port upgrade'
 alias portX='sudo port -u uninstall'
 alias portx='sudo port uninstall'
+
--- a/modules/node/README.md
+++ b/modules/node/README.md
@ -43,3 +43,4 @@ Authors
 [3]: http://nodejs.org/api
 [4]: https://github.com/sorin-ionescu/prezto/issues
 [5]: https://github.com/creationix/nvm
+
--- a/modules/node/functions/node-doc
+++ b/modules/node/functions/node-doc
@ -12,3 +12,4 @@ fi

 # TODO: Make the sections easier to use.
 "$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+
--- a/modules/node/functions/node-info
+++ b/modules/node/functions/node-info
@ -17,8 +17,9 @@ if (( $+functions[nvm_version] )); then
  version="${$(nvm_version)#v}"
 fi

-if [[ "$version" != (none|) ]]; then
+if [[ "$version" == (none|) ]]; then
  zstyle -s ':prezto:module:node:info:version' format 'version_format'
  zformat -f version_formatted "$version_format" "v:$version"
  node_info[version]="$version_formatted"
 fi
+
--- a/modules/node/init.zsh
+++ b/modules/node/init.zsh
@ -6,16 +6,13 @@
 #   Zeh Rizzatti <zehrizzatti@gmail.com>
 #

-# Load manually installed NVM into the shell session.
+# Load NVM into the shell session.
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
  source "$HOME/.nvm/nvm.sh"
-
-# Load package manager installed NVM into the shell session.
-elif (( $+commands[brew] )) && [[ -d "$(brew --prefix nvm 2>/dev/null)" ]]; then
-  source $(brew --prefix nvm)/nvm.sh
+fi

 # Return if requirements are not found.
-elif (( ! $+commands[node] )); then
+if (( ! $+commands[node] )); then
  return 1
 fi

@ -32,3 +29,4 @@ if (( $+commands[npm] )); then

  unset cache_file
 fi
+
--- a/modules/ocaml/README.md
+++ b/modules/ocaml/README.md
@ -25,3 +25,4 @@ Authors
 [1]: http://ocaml.org/
 [2]: http://opam.ocamlpro.com/
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/ocaml/init.zsh
+++ b/modules/ocaml/init.zsh
@ -6,9 +6,10 @@
 #

 # Return if requirements are not found.
-if [[ ! -f "$HOME/.opam/opam-init/init.zsh" ]]; then
+if (( ! $+commands[opam] )); then
  return 1
 fi

 # Initialize OPAM.
-source "$HOME/.opam/opam-init/init.zsh"
+eval "$(opam config env)"
+
--- a/modules/osx/functions/_manb_mand_manp
+++ b/modules/osx/functions/_manb_mand_manp
@ -9,3 +9,4 @@
 #

 _man
+
--- a/modules/osx/functions/mand
+++ b/modules/osx/functions/mand
@ -18,3 +18,4 @@ function mand {
 }

 mand "$@"
+
--- a/modules/osx/functions/manp
+++ b/modules/osx/functions/manp
@ -17,3 +17,4 @@ function manp {
 }

 manp "$@"
+
--- a/modules/osx/functions/tab
+++ b/modules/osx/functions/tab
@ -39,3 +39,4 @@ EOF
    end tell
 EOF
 }
+
--- a/modules/pacman/README.md
+++ b/modules/pacman/README.md
@ -63,3 +63,4 @@ Authors
 [1]: http://www.archlinux.org/pacman/
 [2]: http://archlinux.fr/yaourt-en
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/pacman/functions/pacman-list-disowned
+++ b/modules/pacman/functions/pacman-list-disowned
@ -20,3 +20,4 @@ find /bin /etc /lib /sbin /usr \
    \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"

 comm -23 "$fs" "$db"
+
--- a/modules/pacman/functions/pacman-list-explicit
+++ b/modules/pacman/functions/pacman-list-explicit
@ -18,3 +18,4 @@ pacman --query --explicit --info \
        print $2
      }
    '
+
--- a/modules/pacman/init.zsh
+++ b/modules/pacman/init.zsh
@ -72,7 +72,7 @@ alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recur
 # Synchronizes the local package and Arch Build System databases against the
 # repositories.
 if (( $+commands[abs] )); then
-  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && sudo abs"
+  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs"
 else
  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
 fi
@ -82,3 +82,4 @@ fi
 alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"

 unset _pacman_{frontend,sudo}
+
--- a/modules/pacman/yaourt.zsh
+++ b/modules/pacman/yaourt.zsh
@ -16,3 +16,4 @@ fi

 # Manages .pac* files.
 alias pacc='yaourt -C'
+
--- a/modules/perl/README.md
+++ b/modules/perl/README.md
@ -1,7 +1,7 @@
 Perl
 ====

-Enables local [Perl][1] module installation on Mac OS X and defines aliases.
+Enables local [Perl][1] module installation on Mac OS X and defines alises.

 Local Module Installation
 -------------------------
@ -61,3 +61,4 @@ Authors
 [1]: http://www.perl.org
 [2]: http://perlbrew.pl
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/perl/init.zsh
+++ b/modules/perl/init.zsh
@ -50,3 +50,4 @@ alias plbO='perlbrew switch-off'
 alias plbs='perlbrew switch'
 alias plbu='perlbrew use'
 alias plbx='perlbrew uninstall'
+
--- a/modules/prompt/README.md
+++ b/modules/prompt/README.md
@ -46,7 +46,7 @@ The most basic example of this function can be seen below.
 If the `prompt_name_setup` function is customizable via parameters, a help
 function **should** be defined. The user will access it via `prompt -h name`.

-The most basic example of this function can be seen below.
+The most basic example of this function can be seen bellow.

    function prompt_name_help {
      cat <<EOH
@ -63,7 +63,7 @@ The most basic example of this function can be seen below.
 If the `prompt_name_setup` function is customizable via parameters, a preview
 function **should** be defined. The user will access it via `prompt -p name`.

-The most basic example of this function can be seen below.
+The most basic example of this function can be seen bellow.

    function prompt_name_preview {
      if (( $# > 0 )); then
@ -91,7 +91,7 @@ a function before you calling it.

 **Do not register hook functions. They will be registered by the `prompt` function.**

-The most basic example of this function can be seen below.
+The most basic example of this function can be seen bellow.

    function prompt_name_precmd {
      if (( $+functions[git-info] )); then
@ -109,3 +109,4 @@ Authors
 [1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
 [2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
 [3]: https://github.com/sorin-ionescu/prezto/issues
+
--- a/modules/prompt/external/agnoster
+++ b/modules/prompt/external/agnoster
--- a/modules/prompt/external/powerline
+++ b/modules/prompt/external/powerline
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
--- a/modules/prompt/functions/async
+++ b/modules/prompt/functions/async
@ -1 +0,0 @@
-../external/pure/async.zsh
--- a/modules/prompt/functions/prompt_agnoster_setup
+++ b/modules/prompt/functions/prompt_agnoster_setup
@ -1 +0,0 @@
-../external/agnoster/agnoster.zsh-theme
--- a/modules/prompt/functions/prompt_cloud_setup
+++ b/modules/prompt/functions/prompt_cloud_setup
@ -1,121 +0,0 @@
-#
-# A minimal two-color theme.
-#
-# Authors:
-#   Kevin Laude <nerfyoda@gmail.com>
-#
-# Features:
-#   - One line, left aligned.
-#   - The prompt is prefixed by a character sequence of your choice.
-#   - Only displays the current directory instead of the full path.
-#   - Displays the current branch when in a git project (this requires loading
-#     the git module before prompt in ~/.zpreztorc).
-#   - Displays a character at the end of the prompt when in a git project with
-#     "dirty" files.
-#
-# Usage:
-#   This prompt's prefix symbol and colors are customizable:
-#     prompt cloud [<symbol>] [<color1>] [<color2>]
-#
-#   In ~/.zpreztorc:
-#     zstyle ':prezto:module:prompt' theme 'cloud' \
-#       ['<symbol>'] \
-#       ['<color1>'] \
-#       ['<color2>']
-#
-#   If these options are not provided, the symbol defaults to "☁" with colors
-#   cyan and green.
-#
-# Screenshots:
-#   http://i.imgur.com/mJCZ8rE.png
-#
-# Note:
-#   This is a port of the oh-my-zsh cloud theme, originally written by Phillip
-#   Ridlen <p@rdln.net> and Mark Drago <markdrago@gmail.com>
-#
-
-# Load dependencies.
-pmodload 'helper'
-
-function prompt_cloud_precmd {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-      git-info
-  fi
-}
-
-function prompt_cloud_help {
-  cat <<EOT
-This prompt's prefix symbol and colors are customizable:
-
-  prompt cloud [<symbol>] [<color1>] [<color2>]
-
-In ~/.zpreztorc:
-  zstyle ':prezto:module:prompt' theme 'cloud' ['<symbol>'] ['<color1>'] ['<color2>']
-
-If these options are not provided, the symbol defaults to ☁ with colors cyan
-and green.
-EOT
-}
-
-function prompt_cloud_preview {
-  if (( $# > 0 )); then
-    prompt_preview_theme 'cloud' "$@"
-  else
-    prompt_preview_theme 'cloud'
-    print
-    prompt_preview_theme 'cloud' "✯"
-    print
-    prompt_preview_theme 'cloud' ">" "yellow" "red"
-  fi
-}
-
-function prompt_cloud_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Set the theme prefix to a cloud or to the user's given characters.
-  if [[ -n "$1" ]]; then
-    prefix="$1"
-  else
-    prefix='☁'
-  fi
-
-  # Assign colors.
-  if [[ -n "$2" ]]; then
-    primary_color="$2"
-  else
-    primary_color='cyan'
-  fi
-
-  if [[ -n "$3" ]]; then
-    secondary_color="$3"
-  else
-    secondary_color='green'
-  fi
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook for calling git-info before each command.
-  add-zsh-hook precmd prompt_cloud_precmd
-
-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'yes'
-  zstyle ':prezto:module:git:info:dirty' format "%%B%F{$secondary_color}]%f%%b %F{yellow}⚡%f"
-  zstyle ':prezto:module:git:info:clean' format "%B%F{$secondary_color}]%f%b"
-  zstyle ':prezto:module:git:info:branch' format "%%B%F{$secondary_color}[%f%%b%%B%F{$primary_color}%b%f%%b"
-  zstyle ':prezto:module:git:info:keys' format \
-    'prompt' '%b%C%D' \
-    'rprompt' ''
-
-  # Define prompts.
-  PROMPT='%B%F{$primary_color}${prefix}%f%b  %B%F{$secondary_color}%c%f%b ${git_info:+${(e)git_info[prompt]}} '
-  RPROMPT=''
-}
-
-prompt_cloud_setup "$@"
--- a/modules/prompt/functions/prompt_damoekri_setup
+++ b/modules/prompt/functions/prompt_damoekri_setup
@ -1,76 +0,0 @@
-#
-# A simple theme inspired by the Sorin and PeepCode themes.
-#
-# Authors:
-#   Daniel Møller Kristensen <damoekri@icloud.com>
-#
-# Screenshots:
-#   http://i.imgur.com/AX9HnPF.png
-#
-
-# Load dependencies.
-pmodload 'helper'
-
-function prompt_damoekri_pwd {
-  local pwd="${PWD/#$HOME/~}"
-
-  if [[ "$pwd" == (#m)[/~] ]]; then
-    _prompt_damoekri_pwd="$MATCH"
-    unset MATCH
-  else
-    _prompt_damoekri_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
-  fi
-}
-
-function prompt_damoekri_precmd {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-
-  # Format PWD.
-  prompt_damoekri_pwd
-
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-    git-info
-  fi
-
-  # Get Ruby version information.
-  if (( $+functions[ruby-info] )); then
-    ruby-info
-  fi
-}
-
-function prompt_damoekri_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook for calling git-info and ruby-info before each command.
-  add-zsh-hook precmd prompt_damoekri_precmd
-
-  # Set editor-info parameters.
-  zstyle ':prezto:module:editor:info:keymap:primary' format ' %F{green}»%f'
-
-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'yes'
-  zstyle ':prezto:module:git:info:action' format ':%F{magenta}%s%f'
-  zstyle ':prezto:module:git:info:branch' format '%F{blue}%b%f'
-  zstyle ':prezto:module:git:info:clean' format ' %F{green}✔%f'
-  zstyle ':prezto:module:git:info:dirty' format ' %F{red}✗%f'
-  zstyle ':prezto:module:git:info:commit' format '%F{blue}%.7c%f'
-  zstyle ':prezto:module:git:info:position' format '%F{blue}%p%f'
-  zstyle ':prezto:module:git:info:keys' format \
-    'rprompt' ' $(coalesce "%b" "%p" "%c")%s%C%D'
-
-  # Set ruby-info parameters.
-  zstyle ':prezto:module:ruby:info:version' format ' %F{yellow}%v%f'
-
-  # Define prompts.
-  PROMPT='%F{cyan}${_prompt_damoekri_pwd}%f${editor_info[keymap]} '
-  RPROMPT='${git_info:+${(e)git_info[rprompt]}}${ruby_info:+${ruby_info[version]}}'
-}
-
-prompt_damoekri_setup "$@"
--- a/modules/prompt/functions/prompt_giddie_setup
+++ b/modules/prompt/functions/prompt_giddie_setup
@ -1,76 +0,0 @@
-#
-# A colorful, friendly, multiline theme with some handy features.
-#
-# Authors:
-#   Paul Gideon Dann <pdgiddie@gmail.com>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-# Features:
-#   - Simple VCS branch, staged, and unstaged indication.
-#   - Prompt character is different in a VCS repository.
-#   - Last command exit status is displayed when non-zero.
-#
-# Screenshots:
-#   http://i.imgur.com/rCo3S.png
-#
-
-function +vi-set_novcs_prompt_symbol {
-  _prompt_giddie_symbol=')'
-}
-
-function +vi-set_vcs_prompt_symbol {
-  _prompt_giddie_symbol='±'
-}
-
-function +vi-git_precmd {
-  # Check for untracked files, since vcs_info does not.
-  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-    hook_com[unstaged]+='%F{green}?%f'
-  fi
-}
-
-function prompt_giddie_precmd {
-  # Replace '/home/<user>' with '~'.
-  _prompt_giddie_pwd="${PWD/#$HOME/~}"
-  vcs_info
-}
-
-function prompt_giddie_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz vcs_info
-  autoload -Uz add-zsh-hook
-
-  # Add hook to set up prompt parameters before each command.
-  add-zsh-hook precmd prompt_giddie_precmd
-
-  # Set editor-info parameters.
-  zstyle ':prezto:module:editor:info:completing' format '%F{green}...%f'
-  zstyle ':prezto:module:editor:info:keymap:alternate' format '%F{yellow}--- COMMAND ---%f'
-
-  # Set vcs_info parameters.
-  zstyle ':vcs_info:*' check-for-changes true
-  zstyle ':vcs_info:*' formats ' on %F{magenta}%b%f%c%u'
-  zstyle ':vcs_info:*' actionformats ' on %F{magenta}%b%f%c%u %F{yellow}(%a)%f'
-  zstyle ':vcs_info:*' stagedstr '%F{green}+%f'
-  zstyle ':vcs_info:*' unstagedstr '%F{green}!%f'
-
-  # Set vcs_info hooks.
-  # NOTE: Prior to Zsh v4.3.12, there are no static hooks, no vcs_info_hookadd
-  #       function, and no 'no-vcs' hook.
-  zstyle ':vcs_info:*+start-up:*' hooks set_novcs_prompt_symbol
-  zstyle ':vcs_info:git*+set-message:*' hooks set_vcs_prompt_symbol git_precmd
-  zstyle ':vcs_info:*+set-message:*' hooks set_vcs_prompt_symbol
-
-  # Define prompts.
-  PROMPT='%(?..%F{red}%B-> [%?]%b%f
-)%F{magenta}%n%f@%F{yellow}%m%f|%F{green}${_prompt_giddie_pwd}%f${vcs_info_msg_0_}
-%F{blue}${_prompt_giddie_symbol}%f '
-  RPROMPT='${editor_info[keymap]}'
-  SPROMPT='zsh: correct %F{magenta}%R%f to %F{green}%r%f [nyae]? '
-}
-
-prompt_giddie_setup "$@"
--- a/modules/prompt/functions/prompt_kylewest_setup
+++ b/modules/prompt/functions/prompt_kylewest_setup
@ -1,65 +0,0 @@
-#
-# A single line theme with Git information on the left and Ruby on the right.
-#
-# Authors:
-#   Kyle West <kswest@gmail.com>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-# Features:
-#   - Indicates dirty Git repository.
-#   - Indicates the Ruby version.
-#   - Indicates vi modes.
-#
-# Screenshots:
-#   http://i.imgur.com/dCwhynn.png
-#
-
-function prompt_kylewest_precmd {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-    git-info
-  fi
-
-  # Get Ruby information.
-  if (( $+functions[ruby-info] )); then
-    ruby-info
-  fi
-}
-
-function prompt_kylewest_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook for calling git-info before each command.
-  add-zsh-hook precmd prompt_kylewest_precmd
-
-  # Set editor-info parameters.
-  zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
-  zstyle ':prezto:module:editor:info:keymap:primary' format "%B%F{green}❯%f%b"
-  zstyle ':prezto:module:editor:info:keymap:alternate' format "%B%F{magenta}❮%f%b"
-
-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'no'
-  zstyle ':prezto:module:git:info:branch' format '%F{yellow}%b%f'
-  zstyle ':prezto:module:git:info:dirty' format '%B%F{red}!%f%b'
-  zstyle ':prezto:module:git:info:indexed' format ' '
-  zstyle ':prezto:module:git:info:unindexed' format ' '
-  zstyle ':prezto:module:git:info:untracked' format ' '
-  zstyle ':prezto:module:git:info:keys' format 'prompt' '- %b%D '
-
-  # Set ruby-info parameters.
-  zstyle ':prezto:module:ruby:info:version' format '%F{blue}[%v]%f'
-
-  # Define prompts.
-  PROMPT='%F{cyan}%c%f ${git_info:+${(e)git_info[prompt]}}${editor_info[keymap]} '
-  RPROMPT='${ruby_info[version]}'
-}
-
-prompt_kylewest_setup "$@"
--- a/modules/prompt/functions/prompt_minimal_setup
+++ b/modules/prompt/functions/prompt_minimal_setup
@ -9,7 +9,7 @@
 #   http://i.imgur.com/zLZNK.png
 #

-function +vi-git_status {
+function +vi-git-status() {
  # Check for untracked files or updated submodules since vcs_info does not.
  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
    hook_com[unstaged]='%F{red}●%f'
@ -40,7 +40,7 @@ function prompt_minimal_setup {
  zstyle ':vcs_info:*' formats ' - [%b%c%u]'
  zstyle ':vcs_info:*' actionformats " - [%b%c%u|%F{cyan}%a%f]"
  zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b|%F{cyan}%r%f'
-  zstyle ':vcs_info:git*+set-message:*' hooks git_status
+  zstyle ':vcs_info:git*+set-message:*' hooks git-status

  # Define prompts.
  PROMPT='%2~${vcs_info_msg_0_} » '
@ -48,3 +48,4 @@ function prompt_minimal_setup {
 }

 prompt_minimal_setup "$@"
+
--- a/modules/prompt/functions/prompt_nicoulaj_setup
+++ b/modules/prompt/functions/prompt_nicoulaj_setup
@ -58,3 +58,4 @@ function prompt_nicoulaj_setup {
 }

 prompt_nicoulaj_setup "$@"
+
--- a/modules/prompt/functions/prompt_paradox_setup
+++ b/modules/prompt/functions/prompt_paradox_setup
@ -1,154 +0,0 @@
-#
-# A two-line, Powerline-inspired theme that displays contextual information.
-#
-# This theme requires a patched Powerline font, get them from
-# https://github.com/Lokaltog/powerline-fonts.
-#
-# Authors:
-#   Isaac Wolkerstorfer <i@agnoster.net>
-#   Jeff Sandberg <paradox460@gmail.com>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-# Screenshots:
-#   http://i.imgur.com/0XIWX.png
-#
-
-# Load dependencies.
-pmodload 'helper'
-
-# Define variables.
-_prompt_paradox_current_bg='NONE'
-_prompt_paradox_segment_separator=''
-_prompt_paradox_start_time=$SECONDS
-
-function prompt_paradox_start_segment {
-  local bg fg
-  [[ -n "$1" ]] && bg="%K{$1}" || bg="%k"
-  [[ -n "$2" ]] && fg="%F{$2}" || fg="%f"
-  if [[ "$_prompt_paradox_current_bg" != 'NONE' && "$1" != "$_prompt_paradox_current_bg" ]]; then
-    print -n " $bg%F{$_prompt_paradox_current_bg}$_prompt_paradox_segment_separator$fg "
-  else
-    print -n "$bg$fg "
-  fi
-  _prompt_paradox_current_bg="$1"
-  [[ -n "$3" ]] && print -n "$3"
-}
-
-function prompt_paradox_end_segment {
-  if [[ -n "$_prompt_paradox_current_bg" ]]; then
-    print -n " %k%F{$_prompt_paradox_current_bg}$_prompt_paradox_segment_separator"
-  else
-    print -n "%k"
-  fi
-  print -n "%f"
-  _prompt_paradox_current_bg=''
-}
-
-function prompt_paradox_build_prompt {
-  prompt_paradox_start_segment black default '%(?::%F{red}✘ )%(!:%F{yellow}⚡ :)%(1j:%F{cyan}⚙ :)%F{blue}%n%F{red}@%F{green}%m%f'
-  prompt_paradox_start_segment blue black '$_prompt_paradox_pwd'
-
-  if [[ -n "$git_info" ]]; then
-    prompt_paradox_start_segment green black '${(e)git_info[ref]}${(e)git_info[status]}'
-  fi
-
-  prompt_paradox_end_segment
-}
-
-function prompt_paradox_pwd {
-  local pwd="${PWD/#$HOME/~}"
-
-  if [[ "$pwd" == (#m)[/~] ]]; then
-    _prompt_paradox_pwd="$MATCH"
-    unset MATCH
-  else
-    _prompt_paradox_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
-  fi
-}
-
-function prompt_paradox_print_elapsed_time {
-  local end_time=$(( SECONDS - _prompt_paradox_start_time ))
-  local hours minutes seconds remainder
-
-  if (( end_time >= 3600 )); then
-    hours=$(( end_time / 3600 ))
-    remainder=$(( end_time % 3600 ))
-    minutes=$(( remainder / 60 ))
-    seconds=$(( remainder % 60 ))
-    print -P "%B%F{red}>>> elapsed time ${hours}h${minutes}m${seconds}s%b"
-  elif (( end_time >= 60 )); then
-    minutes=$(( end_time / 60 ))
-    seconds=$(( end_time % 60 ))
-    print -P "%B%F{yellow}>>> elapsed time ${minutes}m${seconds}s%b"
-  elif (( end_time > 10 )); then
-    print -P "%B%F{green}>>> elapsed time ${end_time}s%b"
-  fi
-}
-
-function prompt_paradox_precmd {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-
-  # Format PWD.
-  prompt_paradox_pwd
-
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-    git-info
-  fi
-
-  # Calculate and print the elapsed time.
-  prompt_paradox_print_elapsed_time
-}
-
-function prompt_paradox_preexec {
-  _prompt_paradox_start_time="$SECONDS"
-}
-
-function prompt_paradox_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook for calling git-info before each command.
-  add-zsh-hook preexec prompt_paradox_preexec
-  add-zsh-hook precmd prompt_paradox_precmd
-
-  # Set editor-info parameters.
-  zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
-  zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{blue}❯%f%b'
-  zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format '%F{red}♺%f'
-  zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{red}❮%f%b'
-
-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'yes'
-  zstyle ':prezto:module:git:info:action' format ' ⁝ %s'
-  zstyle ':prezto:module:git:info:added' format ' ✚'
-  zstyle ':prezto:module:git:info:ahead' format ' ⬆'
-  zstyle ':prezto:module:git:info:behind' format ' ⬇'
-  zstyle ':prezto:module:git:info:branch' format ' %b'
-  zstyle ':prezto:module:git:info:commit' format '➦ %.7c'
-  zstyle ':prezto:module:git:info:deleted' format ' ✖'
-  zstyle ':prezto:module:git:info:dirty' format ' ⁝'
-  zstyle ':prezto:module:git:info:modified' format ' ✱'
-  zstyle ':prezto:module:git:info:position' format '%p'
-  zstyle ':prezto:module:git:info:renamed' format ' ➙'
-  zstyle ':prezto:module:git:info:stashed' format ' S'
-  zstyle ':prezto:module:git:info:unmerged' format ' ═'
-  zstyle ':prezto:module:git:info:untracked' format ' ?'
-  zstyle ':prezto:module:git:info:keys' format \
-    'ref' '$(coalesce "%b" "%p" "%c")' \
-    'status' '%s%D%A%B%S%a%d%m%r%U%u'
-
-  # Define prompts.
-  PROMPT='
-${(e)$(prompt_paradox_build_prompt)}
- ${editor_info[keymap]} '
-  RPROMPT='%F{blue}[%F{green}%D{%H:%M:%S}%F{blue}]%f'
-  SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
-}
-
-prompt_paradox_setup "$@"
--- a/modules/prompt/functions/prompt_peepcode_setup
+++ b/modules/prompt/functions/prompt_peepcode_setup
@ -10,13 +10,16 @@
 #   http://i.imgur.com/LhgmW.png
 #

-function prompt_peepcode_precmd {
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-    git-info
+function +vi-git-status() {
+  # Check for untracked files or updated submodules since vcs_info does not.
+  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    hook_com[unstaged]=' %F{8}✗%f'
  fi
+}
+
+function prompt_peepcode_precmd {
+  vcs_info

-  # Get Ruby information.
  if (( $+functions[ruby-info] )); then
    ruby-info
  fi
@ -31,19 +34,18 @@ function prompt_peepcode_setup {
  autoload -Uz add-zsh-hook
  autoload -Uz vcs_info

-  # Add a hook for calling info functions before each command.
+  # Add hook for calling vcs_info before each command.
  add-zsh-hook precmd prompt_peepcode_precmd

-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'no'
-  zstyle ':prezto:module:git:info:action' format ' +%s'
-  zstyle ':prezto:module:git:info:branch' format ' %F{8}%b%f'
-  zstyle ':prezto:module:git:info:commit' format ' %F{white}%.7c%f'
-  zstyle ':prezto:module:git:info:indexed' format ' '
-  zstyle ':prezto:module:git:info:unindexed' format ' '
-  zstyle ':prezto:module:git:info:untracked' format ' '
-  zstyle ':prezto:module:git:info:dirty' format ' %F{8}✗%f'
-  zstyle ':prezto:module:git:info:keys' format 'rprompt' '%b%c%s%D'
+  # Set vcs_info parameters.
+  zstyle ':vcs_info:*' enable git
+  zstyle ':vcs_info:*' check-for-changes true
+  zstyle ':vcs_info:*' get-revision true
+  zstyle ':vcs_info:*' use-simple true
+  zstyle ':vcs_info:*' unstagedstr ' %F{8}✗%f'
+  zstyle ':vcs_info:*' formats ' %F{8}%b%f %F{white}%.7i%f%u'
+  zstyle ':vcs_info:*' actionformats ' %F{8}%b%f %F{white}%.7i%f +%a%u'
+  zstyle ':vcs_info:git*+set-message:*' hooks git-status

  # Set ruby-info parameters.
  zstyle ':prezto:module:ruby:info:version' format ' %F{white}%v%f'
@ -52,7 +54,7 @@ function prompt_peepcode_setup {
  PROMPT="
 %~
 %(?.%F{green}${1:-☻ }%f.%F{red}${1:-☻ }%f) "
-RPROMPT='${ruby_info[version]}${git_info[rprompt]}'
+RPROMPT='${ruby_info[version]}${vcs_info_msg_0_}'

 }

@ -83,3 +85,4 @@ function prompt_peepcode_preview {
 }

 prompt_peepcode_setup "$@"
+
--- a/modules/prompt/functions/prompt_powerline_setup
+++ b/modules/prompt/functions/prompt_powerline_setup
@ -1 +0,0 @@
-../external/powerline/prompt_powerline_setup
--- a/modules/prompt/functions/prompt_pure_setup
+++ b/modules/prompt/functions/prompt_pure_setup
@ -1 +0,0 @@
-../external/pure/pure.zsh
--- a/modules/prompt/functions/prompt_skwp_setup
+++ b/modules/prompt/functions/prompt_skwp_setup
@ -1,75 +0,0 @@
-#
-# A single line theme with Git information on the left and Ruby on the right.
-#
-# Authors:
-#   Steve Losh <steve@stevelosh.com>
-#   Bart Trojanowski <bart@jukie.net>
-#   Brian Carper <brian@carper.ca>
-#   steeef <steeef@gmail.com>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#   Yan Pritzker <yan@pritzker.ws>
-#
-# Screenshots:
-#   http://i.imgur.com/gLgVp6Y.png
-#
-
-function prompt_skwp_precmd {
-  # Get Git repository information.
-  if (( $+functions[git-info] )); then
-    git-info
-  fi
-
-  # Get Ruby information.
-  if (( $+functions[ruby-info] )); then
-    ruby-info
-  fi
-}
-
-function prompt_skwp_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook to set up prompt parameters before each command.
-  add-zsh-hook precmd prompt_skwp_precmd
-
-  # Use extended color pallete if available.
-  if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
-    _prompt_skwp_colors=(
-      "%F{81}"  # Turquoise
-      "%F{166}" # Orange
-      "%F{135}" # Purple
-      "%F{161}" # Hotpink
-      "%F{118}" # Limegreen
-    )
-  else
-    _prompt_skwp_colors=(
-      "%F{cyan}"
-      "%F{yellow}"
-      "%F{magenta}"
-      "%F{red}"
-      "%F{green}"
-    )
-  fi
-
-  # Set git-info parameters.
-  zstyle ':prezto:module:git:info' verbose 'yes'
-  zstyle ':prezto:module:git:info:branch' format "${_prompt_skwp_colors[1]}%b%f"
-  zstyle ':prezto:module:git:info:added' format "${_prompt_skwp_colors[5]}●%f"
-  zstyle ':prezto:module:git:info:deleted' format "${_prompt_skwp_colors[2]}●%f"
-  zstyle ':prezto:module:git:info:modified' format "${_prompt_skwp_colors[4]}●%f"
-  zstyle ':prezto:module:git:info:untracked' format "${_prompt_skwp_colors[3]}●%f"
-  zstyle ':prezto:module:git:info:keys' format 'prompt' '(%b%d%a%m%u)'
-
-  # Set ruby-info parameters.
-  zstyle ':prezto:module:ruby:info:version' format '[%v]'
-
-  # Define prompts.
-  PROMPT="${_prompt_skwp_colors[3]}%n%f@${_prompt_skwp_colors[2]}%m%f ${_prompt_skwp_colors[5]}%~%f "'${git_info:+${(e)git_info[prompt]}}'"$ "
-  RPROMPT='%F{blue}${ruby_info[version]}'
-}
-
-prompt_skwp_setup "$@"
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`../external/powerline/prompt_powerline_setup`