From b11b9ce788dbe389bd6c7984748de243b43b46bd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jun 2018 15:42:45 +0200 Subject: [PATCH 01/14] Fix path to global ssh known hosts file The path to the global known hosts file is /etc/ssh/ssh_known_hosts, not /etc/ssh_hosts. --- modules/completion/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh index e2cc2d4472..e25a22a409 100644 --- a/modules/completion/init.zsh +++ b/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_known_hosts,~/.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 }:#*\**}:#*\?*}} )' From b015003332b69e4276c6d146c9a1197976420a6f Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 18 Jun 2018 15:33:45 -0400 Subject: [PATCH 02/14] updating submodules --- modules/completion/external | 2 +- modules/syntax-highlighting/external | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/completion/external b/modules/completion/external index 1a71e0a1a3..d3a273cedf 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit 1a71e0a1a36117722c02736487e6940e72455e0b +Subproject commit d3a273cedf788181db9a05726dcd4d930da9e248 diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external index 02a37dd919..db6cac391b 160000 --- a/modules/syntax-highlighting/external +++ b/modules/syntax-highlighting/external @@ -1 +1 @@ -Subproject commit 02a37dd919dc48e0821186e5f20e78bd0215f86a +Subproject commit db6cac391bee957c20ff3175b2f03c4817253e60 From 319aad3abac37892c2b778c57ce57e327cfb3db0 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 18 Jun 2018 15:57:23 -0400 Subject: [PATCH 03/14] submodules update --- modules/completion/external | 2 +- modules/syntax-highlighting/external | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/completion/external b/modules/completion/external index d3a273cedf..1a71e0a1a3 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit d3a273cedf788181db9a05726dcd4d930da9e248 +Subproject commit 1a71e0a1a36117722c02736487e6940e72455e0b diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external index db6cac391b..02a37dd919 160000 --- a/modules/syntax-highlighting/external +++ b/modules/syntax-highlighting/external @@ -1 +1 @@ -Subproject commit db6cac391bee957c20ff3175b2f03c4817253e60 +Subproject commit 02a37dd919dc48e0821186e5f20e78bd0215f86a From 0d6e7de0312366322bf7e7e1dbb41697b5bcd3b1 Mon Sep 17 00:00:00 2001 From: Kaleb Elwert Date: Mon, 18 Jun 2018 14:16:36 -0700 Subject: [PATCH 04/14] syntax-highlighting: Update README to clarify module load order Fixes #1584 --- modules/syntax-highlighting/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/syntax-highlighting/README.md b/modules/syntax-highlighting/README.md index 5dad5bbad9..7a28892a46 100644 --- a/modules/syntax-highlighting/README.md +++ b/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 ------------ From cd7082299467a26d443e597f1fd2f02506a45a6a Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Tue, 26 Jun 2018 13:43:27 -0500 Subject: [PATCH 05/14] completion: Compact path to global ssh known hosts file --- modules/completion/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh index e25a22a409..48202f3724 100644 --- a/modules/completion/init.zsh +++ b/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,~/.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 }:#*\**}:#*\?*}} )' From e149367445d2bcb9faa6ada365dfd56efec39de8 Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Wed, 27 Jun 2018 09:28:04 +1000 Subject: [PATCH 06/14] coreutils: update list of included coreutils (#1592) --- modules/gnu-utility/init.zsh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gnu-utility/init.zsh b/modules/gnu-utility/init.zsh index cbf9a4baa8..4675a3ca56 100644 --- a/modules/gnu-utility/init.zsh +++ b/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' From 152b4a1b5d61905b60134869d9ba854465ea53d9 Mon Sep 17 00:00:00 2001 From: Tharre Date: Sat, 28 Jul 2018 18:33:24 +0200 Subject: [PATCH 07/14] Fix broken gitref link in README.md gitref.org points to services.github.com, and has been for some time[0]. [0] https://github.com/git/git-reference/issues/112 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18bcfcce4e..2f94cd6ccd 100644 --- a/README.md +++ b/README.md @@ -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 From e064d5c65f49b5eae3c083c14b57b58dfe996a14 Mon Sep 17 00:00:00 2001 From: Michael Kohl Date: Wed, 18 Jul 2018 15:08:21 +0700 Subject: [PATCH 08/14] Make node-info work without nvm/nodenv --- modules/node/functions/node-info | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/node/functions/node-info b/modules/node/functions/node-info index 22ac31bd5c..9feca3e16e 100644 --- a/modules/node/functions/node-info +++ b/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 From dacef142144aaddd886a2a6898cba506a9ea01b9 Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Sat, 14 Jul 2018 09:40:39 -0400 Subject: [PATCH 09/14] Improve startup time by skipping pyenv rehash After profiling startup time, I found that "pyenv rehash" is by far the slowest piece. This change skips rehashing on init. See https://github.com/pyenv/pyenv/issues/784#issuecomment-404850327 Also pass the shell explicitly, as suggested in https://github.com/pyenv/pyenv/issues/784#issuecomment-404944318, which provides a modest improvement. In total, this improves startup time from 1s to 0.3s on my machine. Using the following command: python -m timeit "__import__('subprocess').Popen(['zsh', '-i', '-c', 'echo']).communicate()" Result before this change: 10 loops, best of 3: 1 sec per loop Result after this change: 10 loops, best of 3: 334 msec per loop --- modules/python/init.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/python/init.zsh b/modules/python/init.zsh index 45e9b8dd6b..28f671e0cf 100644 --- a/modules/python/init.zsh +++ b/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 From f2042a29cc7613e8f797044948b0238916b2a234 Mon Sep 17 00:00:00 2001 From: Diego Rabatone Oliveira Date: Thu, 9 Aug 2018 15:25:30 -0300 Subject: [PATCH 10/14] Update submodules (#1615) This updates the submodules for autosuggestions, completion, syntax-highlighting and the prompts async, powerlevel9k and pure. All submodules that have TAGs/Releases were updated to their latest TAG/release, except for syntax-highlighting because it's latest release/TAG is from more than one year ago, and the project seems to be well maintained but without releases. --- modules/autosuggestions/external | 2 +- modules/completion/external | 2 +- modules/prompt/external/async | 2 +- modules/prompt/external/powerlevel9k | 2 +- modules/prompt/external/pure | 2 +- modules/syntax-highlighting/external | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external index 15931f04ff..d7c796719e 160000 --- a/modules/autosuggestions/external +++ b/modules/autosuggestions/external @@ -1 +1 @@ -Subproject commit 15931f04ffac91a2f9a1a044b6b3ee4050751064 +Subproject commit d7c796719e6352666f7a9c94da9ddaed10f3217d diff --git a/modules/completion/external b/modules/completion/external index 2a30b05a5c..7ec52769d3 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit 2a30b05a5cf724a2d1c4c140c302dbf93f6aa6f6 +Subproject commit 7ec52769d3a0dd505d33d857511866d2b90d0eec diff --git a/modules/prompt/external/async b/modules/prompt/external/async index b001fa529a..da48ccb0e2 160000 --- a/modules/prompt/external/async +++ b/modules/prompt/external/async @@ -1 +1 @@ -Subproject commit b001fa529a874fbe8bd22a9d4526153138645289 +Subproject commit da48ccb0e2ade777a10decfe214b5433d990d0d9 diff --git a/modules/prompt/external/powerlevel9k b/modules/prompt/external/powerlevel9k index 17c069d25a..d031b3e035 160000 --- a/modules/prompt/external/powerlevel9k +++ b/modules/prompt/external/powerlevel9k @@ -1 +1 @@ -Subproject commit 17c069d25ac7b24af6b5dc7ecb9597cef881f582 +Subproject commit d031b3e03522d47607173ebda89e7558b622a322 diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure index a95d55cc7d..fa9137ecec 160000 --- a/modules/prompt/external/pure +++ b/modules/prompt/external/pure @@ -1 +1 @@ -Subproject commit a95d55cc7d3a73fc562ac11e23c26113ed6d58cf +Subproject commit fa9137ecec76d23fe76fd6fabe9c2f8ae0de9cf5 diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external index 434af7b11d..db6cac391b 160000 --- a/modules/syntax-highlighting/external +++ b/modules/syntax-highlighting/external @@ -1 +1 @@ -Subproject commit 434af7b11dd33641231f1b48b8432e68eb472e46 +Subproject commit db6cac391bee957c20ff3175b2f03c4817253e60 From 66487c95329874019d17920390c3101faa9dead7 Mon Sep 17 00:00:00 2001 From: newtonne Date: Mon, 13 Aug 2018 02:56:21 +0100 Subject: [PATCH 11/14] Correct alphabetical order in zprestorc --- runcoms/zpreztorc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc index 28b6005467..a54907344c 100644 --- a/runcoms/zpreztorc +++ b/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 # From 7bb7a7cb6fe02cce77ad31e91796f84b1a8f1011 Mon Sep 17 00:00:00 2001 From: Bruce Clounie Date: Sat, 21 Jul 2018 01:06:31 -0600 Subject: [PATCH 12/14] Add explanation for extra git theme symbols in README.md Helps with #1589 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f94cd6ccd..bcbe15914e 100644 --- a/README.md +++ b/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*. From 71020076f9476c63d47317d050a02b03767cb956 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Wed, 15 Aug 2018 15:48:57 -0400 Subject: [PATCH 13/14] p9k prompt change --- runcoms/zshrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runcoms/zshrc b/runcoms/zshrc index 4141c3c8ca..ecdaa16941 100644 --- a/runcoms/zshrc +++ b/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 From f2fc9fa79c606556a98e0ef2b1bb0f6e06a4dc91 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Wed, 15 Aug 2018 16:34:54 -0400 Subject: [PATCH 14/14] updating submodules --- modules/autosuggestions/external | 2 +- modules/prompt/external/async | 2 +- modules/prompt/external/powerlevel9k | 2 +- modules/prompt/external/pure | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external index d7c796719e..ebaf409002 160000 --- a/modules/autosuggestions/external +++ b/modules/autosuggestions/external @@ -1 +1 @@ -Subproject commit d7c796719e6352666f7a9c94da9ddaed10f3217d +Subproject commit ebaf409002be498a681267a75f5efcaf45cd0ccc diff --git a/modules/prompt/external/async b/modules/prompt/external/async index da48ccb0e2..5248bd85bf 160000 --- a/modules/prompt/external/async +++ b/modules/prompt/external/async @@ -1 +1 @@ -Subproject commit da48ccb0e2ade777a10decfe214b5433d990d0d9 +Subproject commit 5248bd85bf2c522ebfa2b8d18ee7bc736d10c791 diff --git a/modules/prompt/external/powerlevel9k b/modules/prompt/external/powerlevel9k index d031b3e035..571a859413 160000 --- a/modules/prompt/external/powerlevel9k +++ b/modules/prompt/external/powerlevel9k @@ -1 +1 @@ -Subproject commit d031b3e03522d47607173ebda89e7558b622a322 +Subproject commit 571a859413866897cf962396f02f65a288f677ac diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure index fa9137ecec..872153f446 160000 --- a/modules/prompt/external/pure +++ b/modules/prompt/external/pure @@ -1 +1 @@ -Subproject commit fa9137ecec76d23fe76fd6fabe9c2f8ae0de9cf5 +Subproject commit 872153f44678d8084ce41753fe6a92b92040b411