From f2042a29cc7613e8f797044948b0238916b2a234 Mon Sep 17 00:00:00 2001 From: Diego Rabatone Oliveira Date: Thu, 9 Aug 2018 15:25:30 -0300 Subject: [PATCH 1/3] 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 15931f04..d7c79671 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 2a30b05a..7ec52769 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 b001fa52..da48ccb0 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 17c069d2..d031b3e0 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 a95d55cc..fa9137ec 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 434af7b1..db6cac39 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 2/3] Correct alphabetical order in zprestorc --- runcoms/zpreztorc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc index 28b60054..a5490734 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 3/3] 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 2f94cd6c..bcbe1591 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*.