Merge branch 'master' of https://github.com/billimek/prezto

* 'master' of https://github.com/billimek/prezto:
  updating submodules
  p9k prompt change
  Add explanation for extra git theme symbols in README.md
  Correct alphabetical order in zprestorc
  Update submodules (sorin-ionescu#1615)
  Improve startup time by skipping pyenv rehash
  Make node-info work without nvm/nodenv
  Fix broken gitref link in README.md
  coreutils: update list of included coreutils (sorin-ionescu#1592)
  completion: Compact path to global ssh known hosts file
  syntax-highlighting: Update README to clarify module load order
  submodules update
  updating submodules
  Fix path to global ssh known hosts file

README.md

@@ -88,8 +88,8 @@ accompanying README files to learn of what is available.
   3. Load the theme you like in *~/.zpreztorc* then open a new Zsh terminal
      window or tab.
 
-     ![sorin theme][2]
-
+     ![sorin theme][2]  
+     Note that the 'git' module may be required for special symbols to appear, such as those on the right of the above image. Add `'git'` to the list under `zstyle ':prezto:load' pmodule \ ` in your `.zpreztorc` to enable this module.
 ### External Modules
 
   1. By default modules will be loaded from */modules* and */contrib*.
@@ -126,6 +126,6 @@ This project is licensed under the MIT License.
 [3]: http://git-scm.com
 [4]: https://github.com
 [5]: http://gitimmersion.com
-[6]: http://gitref.org
+[6]: https://git.github.io/git-reference/
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html

modules/completion/init.zsh

@@ -107,7 +107,7 @@ zstyle ':completion::*:(-command-|export):*' fake-parameters ${${${_comps[(I)-va
 zstyle -a ':prezto:module:completion:*:hosts' etc-host-ignores '_etc_host_ignores'
 
 zstyle -e ':completion:*:hosts' hosts 'reply=(
-  ${=${=${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2> /dev/null)"}%%[#| ]*}//\]:[0-9]*/ }//,/ }//\[/ }
+  ${=${=${=${${(f)"$(cat {/etc/ssh/ssh_,~/.ssh/}known_hosts(|2)(N) 2> /dev/null)"}%%[#| ]*}//\]:[0-9]*/ }//,/ }//\[/ }
   ${=${(f)"$(cat /etc/hosts(|)(N) <<(ypcat hosts 2> /dev/null))"}%%(\#${_etc_host_ignores:+|${(j:|:)~_etc_host_ignores}})*}
   ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2> /dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}}
 )'

modules/gnu-utility/init.zsh

@@ -15,16 +15,16 @@ fi
 
 _gnu_utility_cmds=(
   # Coreutils
-  '[' 'base64' 'basename' 'cat' 'chcon' 'chgrp' 'chmod' 'chown'
+  '[' 'b2sum' 'base32' 'base64' 'basename' 'cat' 'chcon' 'chgrp' 'chmod' 'chown'
   'chroot' 'cksum' 'comm' 'cp' 'csplit' 'cut' 'date' 'dd' 'df'
   'dir' 'dircolors' 'dirname' 'du' 'echo' 'env' 'expand' 'expr'
   'factor' 'false' 'fmt' 'fold' 'groups' 'head' 'hostid' 'id'
-  'install' 'join' 'kill' 'link' 'ln' 'logname' 'ls' 'md5sum'
-  'mkdir' 'mkfifo' 'mknod' 'mktemp' 'mv' 'nice' 'nl' 'nohup' 'nproc'
-  'od' 'paste' 'pathchk' 'pinee' 'pr' 'printenv' 'printf' 'ptx'
+  'install' 'join' 'kill' 'link' 'ln' 'logname' 'ls' 'md5sum' 'mkdir'
+  'mkfifo' 'mknod' 'mktemp' 'mv' 'nice' 'nl' 'nohup' 'nproc'
+  'numfmt' 'od' 'paste' 'pathchk' 'pinky' 'pr' 'printenv' 'printf' 'ptx'
   'pwd' 'readlink' 'realpath' 'rm' 'rmdir' 'runcon' 'seq' 'sha1sum'
   'sha224sum' 'sha256sum' 'sha384sum' 'sha512sum' 'shred' 'shuf'
-  'sleep' 'sort' 'split' 'stat' 'stty' 'sum' 'sync' 'tac' 'tail'
+  'sleep' 'sort' 'split' 'stat' 'stdbuf' 'stty' 'sum' 'sync' 'tac' 'tail'
   'tee' 'test' 'timeout' 'touch' 'tr' 'true' 'truncate' 'tsort'
   'tty' 'uname' 'unexpand' 'uniq' 'unlink' 'uptime' 'users' 'vdir'
   'wc' 'who' 'whoami' 'yes'

modules/node/functions/node-info

@@ -19,6 +19,8 @@ if (( $+functions[nvm_version] )); then
   version="${$(nvm_version)#v}"
 elif (( $+commands[nodenv] )); then
   version="${${$(nodenv version)#v}[(w)0]}"
+elif (( $+commands[node] )) ; then
+  version="${$(node -v)#v}"  
 fi
 
 if [[ "$version" != (none|) ]]; then

modules/python/init.zsh

@@ -11,12 +11,12 @@
 if [[ -s "$HOME/.pyenv/bin/pyenv" ]]; then
   path=("$HOME/.pyenv/bin" $path)
   export PYENV_ROOT=$(pyenv root)
-  eval "$(pyenv init -)"
+  eval "$(pyenv init - --no-rehash zsh)"
 
 # Load package manager installed pyenv into the shell session.
 elif (( $+commands[pyenv] )); then
   export PYENV_ROOT=$(pyenv root)
-  eval "$(pyenv init -)"
+  eval "$(pyenv init - --no-rehash zsh)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
 # ~/Library/Python on macOS and ~/.local elsewhere, to PATH. The
@@ -106,7 +106,7 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
 
   if (( $pyenv_plugins[(i)virtualenv-init] <= $#pyenv_plugins )); then
     # Enable 'virtualenv' with 'pyenv'.
-    eval "$(pyenv virtualenv-init -)"
+    eval "$(pyenv virtualenv-init - zsh)"
 
     # Optionally activate 'virtualenvwrapper' plugin when available.
     if (( $pyenv_plugins[(i)virtualenvwrapper(_lazy|)] <= $#pyenv_plugins )); then

modules/syntax-highlighting/README.md

@@ -3,9 +3,11 @@ Syntax Highlighting
 
 Integrates [zsh-syntax-highlighting][1] into Prezto.
 
-This module should be loaded *second to last*, where last is the *prompt*
-module, unless used in conjuncture with the *history-substring-search* module
-where it must be loaded **before** it.
+This module should be loaded before the *prompt* module.
+
+Additionally, if this module is used in conjunction with the
+*history-substring-search* module, this module must be loaded **before** the
+*history-substring-search* module.
 
 Contributors
 ------------

runcoms/zpreztorc

@@ -124,13 +124,6 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 # return codes. This is not supported by all prompts.
 # zstyle ':prezto:module:prompt' show-return-val 'yes'
 
-#
-# Ruby
-#
-
-# Auto switch the Ruby version on directory change.
-# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
-
 #
 # Python
 #
@@ -141,6 +134,13 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 # Automatically initialize virtualenvwrapper if pre-requisites are met.
 # zstyle ':prezto:module:python:virtualenv' initialize 'yes'
 
+#
+# Ruby
+#
+
+# Auto switch the Ruby version on directory change.
+# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+
 #
 # Screen
 #

runcoms/zshrc

@@ -13,6 +13,7 @@ POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="❯ "
 POWERLEVEL9K_CUSTOM_CF_STRING="cf-get-info"
 # POWERLEVEL9K_CUSTOM_CF_STRING_BACKGROUND="grey"
 POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs custom_cf_string)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs time)
 
 
 # Source Prezto.
@@ -28,3 +29,8 @@ if [ -f '$HOME/google-cloud-sdk/path.zsh.inc' ]; then source '$HOME/google-cloud
 
 # The next line enables shell command completion for gcloud.
 if [ -f '$HOME/google-cloud-sdk/completion.zsh.inc' ]; then source '$HOME/google-cloud-sdk/completion.zsh.inc'; fi
+
+# added by travis gem
+[ -f /Users/jeff/.travis/travis.sh ] && source /Users/jeff/.travis/travis.sh
+source /Users/jeff/google-cloud-sdk/path.zsh.inc
+source /Users/jeff/google-cloud-sdk/completion.zsh.inc