don't overwrite the WORKON_HOME env var if the user has already set it

modules/git/README.md

@@ -237,7 +237,6 @@ Functions
   - `git-stash-recover` recovers given dropped stashed states.
   - `git-submodule-move` moves a submodule.
   - `git-submodule-remove` removes a submodule.
-  - `git-ignore-template` get gitignore template from [gitignore.io][9]
 
 Theming
 -------
@@ -333,4 +332,3 @@ 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
-[9]: https://gitignore.io/

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 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 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 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 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 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 glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
 alias glc='git shortlog --summary --numbered'
 
 # Merge (m)
@@ -179,6 +179,3 @@ alias gwc='git clean -n'
 alias gwC='git clean -f'
 alias gwx='git rm -r'
 alias gwX='git rm -rf'
-
-# Ignore list (ig)
-alias gig='git-ignore-template'

modules/git/functions/_git-ignore-template

@@ -1,26 +0,0 @@
-#compdef _gitignireio git-ignore-template
-#autoload
-
-#
-# Completes git-ignore-template
-#
-# Authors:
-#   Haojia Che <haojia.che@gmail.com>
-#
-
-typeset -A opt_args
-
-_arguments -C \
-    '1::ignore:->ignores' \
-&& ret=0
-
-list=(`git-ignore-template`)
-
-case "$state" in
-    (ignores)
-        languages=(`echo  $list| tr "," "\n"`)
-        _describe 'templates' languages && ret=0
-    ;;
-esac;
-
-return 1;

modules/git/functions/git-ignore-template

@@ -1,20 +0,0 @@
-#
-# Get  ignore template from https://gitignore.io.
-#
-# Authors:
-#   Haojia Che <haojia.che@gmail.com>
-#
-#  Use `git-ignore-template` or `git-ignore-template list` to get the list
-#  Uset `git-ignore-template <template name>` to get the template 
-#
-#   Example:
-#   `git-ignore-template java` to get a  gitignore template for java.
-#
-
-function git-ignore-template() {
-    if [ $@ ]; then
-        curl -L -s https://www.gitignore.io/api/$@;
-    else
-        curl -L -s https://www.gitignore.io/api/list;
-    fi
-}

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

modules/node/functions/node-info

@@ -17,7 +17,7 @@ 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"

modules/node/init.zsh

@@ -6,13 +6,9 @@
 #   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.

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
 -------------------------

modules/python/init.zsh

@@ -34,10 +34,11 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
   return 1
 fi
 
-# Load virtualenvwrapper into the shell session.
+# Load virtualenvwrapper into the shell session, unless requested not to
-if (( $+commands[virtualenvwrapper.sh] )); then
+zstyle -t ':prezto:module:python' skip-virtualenvwrapper-init
+if (( $? && $+commands[virtualenvwrapper.sh] )); then
   # Set the directory where virtual environments are stored.
-  export WORKON_HOME="$HOME/.virtualenvs"
+  export WORKON_HOME="${WORKON_HOME:-$HOME/.virtualenvs}"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1

modules/rsync/init.zsh

@@ -16,14 +16,10 @@ fi
 
 _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
 
-if grep -q 'xattrs' <(rsync --help 2>&1); then
-  _rsync_cmd="${_rsync_cmd} --acls --xattrs"
-fi
-
 # Mac OS X and HFS+ Enhancements
 # http://help.bombich.com/kb/overview/credits#opensource
 if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then
-  _rsync_cmd="${_rsync_cmd} --crtimes --fileflags --protect-decmpfs --force-change"
+  _rsync_cmd="${_rsync_cmd} --crtimes --acls --xattrs --fileflags --protect-decmpfs --force-change"
 fi
 
 alias rsync-copy="${_rsync_cmd}"