From ac05771e705399a4dafc34a27c3a6a575f9e0153 Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Wed, 21 Mar 2018 20:19:05 -0700 Subject: [PATCH 01/13] Update Zim Logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a01edc8..7a866d0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ZIM - Zsh IMproved
- +
From 02289fe6005b2f8f375dbe687f771b597e2b1ca1 Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Thu, 22 Mar 2018 18:32:13 -0700 Subject: [PATCH 02/13] Updated Logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a866d0..eee432d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ZIM - Zsh IMproved
- +
From 0bcf58fcf299ffd5e2a4294e70eeec74dea36ef1 Mon Sep 17 00:00:00 2001 From: Yonatan Ahituv Date: Wed, 28 Mar 2018 21:40:24 -0700 Subject: [PATCH 03/13] Updated Plugin Loading --- init.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init.zsh b/init.zsh index 0ee95ed..171cbe0 100755 --- a/init.zsh +++ b/init.zsh @@ -34,6 +34,10 @@ fi for zmodule (${zmodules}); do if [[ -s ${ZIM_HOME}/modules/${zmodule}/init.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/init.zsh + elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh ]]; then + source ${ZIM_HOME}/modules/${zmodule}.zsh + elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh ]]; then + source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh elif [[ ! -d ${ZIM_HOME}/modules/${zmodule} ]]; then print "No such module \"${zmodule}\"." >&2 fi From b84c7b79d2e6ae3ca0d39311dabb92e2b1bed9bb Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Thu, 29 Mar 2018 09:09:08 -0700 Subject: [PATCH 04/13] Fixed Sourcing --- init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.zsh b/init.zsh index 171cbe0..0504e62 100755 --- a/init.zsh +++ b/init.zsh @@ -35,7 +35,7 @@ fi if [[ -s ${ZIM_HOME}/modules/${zmodule}/init.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/init.zsh elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}.zsh + source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh elif [[ ! -d ${ZIM_HOME}/modules/${zmodule} ]]; then From 4164e3fede6ead72a54b4661e6455d7ad326c08c Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Thu, 29 Mar 2018 10:14:06 -0700 Subject: [PATCH 05/13] Updated to load more plugin names Prioritized .plugin.zsh over .zsh and prepended zsh- if all else fails --- init.zsh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init.zsh b/init.zsh index 0504e62..bfc0f85 100755 --- a/init.zsh +++ b/init.zsh @@ -34,10 +34,14 @@ fi for zmodule (${zmodules}); do if [[ -s ${ZIM_HOME}/modules/${zmodule}/init.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/init.zsh + elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh ]]; then + source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh - elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh + elif [[ -s ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.plugin.zsh ]]; then + source ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.plugin.zsh + elif [[ -s ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.zsh ]]; then + source ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.zsh elif [[ ! -d ${ZIM_HOME}/modules/${zmodule} ]]; then print "No such module \"${zmodule}\"." >&2 fi From 7f89aa79e93ad3b7afa93ac2fc071d5550077198 Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Thu, 29 Mar 2018 10:19:21 -0700 Subject: [PATCH 06/13] Changed Logo Back --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eee432d..a01edc8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ZIM - Zsh IMproved From a4c25734e0e6c22c7cb66e1d981e69da554f0e29 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:34:06 -0700 Subject: [PATCH 07/13] Added Sorin Prompt --- modules/prompt/functions/prompt_sorin_setup | 120 ++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100755 modules/prompt/functions/prompt_sorin_setup diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup new file mode 100755 index 0000000..d9f5a62 --- /dev/null +++ b/modules/prompt/functions/prompt_sorin_setup @@ -0,0 +1,120 @@ +# +# A simple theme that displays relevant, contextual information. +# +# Authors: +# Sorin Ionescu +# +# Screenshots: +# http://i.imgur.com/nrGV6pg.png +# + +# +# 16 Terminal Colors +# -- --------------- +# 0 black +# 1 red +# 2 green +# 3 yellow +# 4 blue +# 5 magenta +# 6 cyan +# 7 white +# 8 bright black +# 9 bright red +# 10 bright green +# 11 bright yellow +# 12 bright blue +# 13 bright magenta +# 14 bright cyan +# 15 bright white +# + +function prompt_sorin_git { + cd -q "$1" + if (( $+functions[git-info] )); then + git-info + print ${git_info[status]} + fi +} +function prompt-pwd { + +setopt localoptions extendedglob + +local current_pwd="${PWD/#$HOME/~}" +local ret_directory + +if [[ "$current_pwd" == (#m)[/~] ]]; then + ret_directory="$MATCH" + unset MATCH +elif zstyle -m ':prezto:module:prompt' pwd-length 'full'; then + ret_directory=${PWD} +elif zstyle -m ':prezto:module:prompt' pwd-length 'long'; then + ret_directory=${current_pwd} +else + ret_directory="${${${${(@j:/:M)${(@s:/:)current_pwd}##.#?}:h}%/}//\%/%%}/${${current_pwd:t}//\%/%%}" +fi + +unset current_pwd + +print "$ret_directory" + +} +function prompt_sorin_precmd { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + + # Format PWD. + # PWD taken from Prezto + _prompt_sorin_pwd=$(prompt-pwd) + + # Handle updating git data. We also clear the git prompt data if we're in a + # different git root now. + if (( $+functions[git-dir] )); then + local new_git_root="$(git-dir 2> /dev/null)" + if [[ $new_git_root != $_sorin_cur_git_root ]]; then + _prompt_sorin_git=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` + _sorin_cur_git_root=$new_git_root + fi + fi + + # Run python info (this should be fast and not require any async) + if (( $+functions[python-info] )); then + python-info + fi +} + +function prompt_sorin_setup { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + prompt_opts=(cr percent sp subst) + # Add hook for calling git-info before each command. + add-zsh-hook precmd prompt_sorin_precmd + + + + # Set up non-zero return value display + local show_return="✘ " + + # Get the async worker set up + _sorin_cur_git_root='' + + _prompt_sorin_git='' + _prompt_sorin_pwd='' + # Define prompts. + PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{10}> ' + RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}' + RPROMPT+=${show_return} + RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}' + # SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? ' +} + +function prompt_sorin_preview { + local +h PROMPT='' + local +h RPROMPT='' + local +h SPROMPT='' + + editor-info 2> /dev/null + prompt_preview_theme 'sorin' +} + +prompt_sorin_setup "$@" From 0370d6d4e5919d1b164101a54c45ba36ea8697d5 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:35:13 -0700 Subject: [PATCH 08/13] Removed Sorin Prompt, forgot to move to other branch --- modules/prompt/functions/prompt_sorin_setup | 120 -------------------- 1 file changed, 120 deletions(-) delete mode 100755 modules/prompt/functions/prompt_sorin_setup diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup deleted file mode 100755 index d9f5a62..0000000 --- a/modules/prompt/functions/prompt_sorin_setup +++ /dev/null @@ -1,120 +0,0 @@ -# -# A simple theme that displays relevant, contextual information. -# -# Authors: -# Sorin Ionescu -# -# Screenshots: -# http://i.imgur.com/nrGV6pg.png -# - -# -# 16 Terminal Colors -# -- --------------- -# 0 black -# 1 red -# 2 green -# 3 yellow -# 4 blue -# 5 magenta -# 6 cyan -# 7 white -# 8 bright black -# 9 bright red -# 10 bright green -# 11 bright yellow -# 12 bright blue -# 13 bright magenta -# 14 bright cyan -# 15 bright white -# - -function prompt_sorin_git { - cd -q "$1" - if (( $+functions[git-info] )); then - git-info - print ${git_info[status]} - fi -} -function prompt-pwd { - -setopt localoptions extendedglob - -local current_pwd="${PWD/#$HOME/~}" -local ret_directory - -if [[ "$current_pwd" == (#m)[/~] ]]; then - ret_directory="$MATCH" - unset MATCH -elif zstyle -m ':prezto:module:prompt' pwd-length 'full'; then - ret_directory=${PWD} -elif zstyle -m ':prezto:module:prompt' pwd-length 'long'; then - ret_directory=${current_pwd} -else - ret_directory="${${${${(@j:/:M)${(@s:/:)current_pwd}##.#?}:h}%/}//\%/%%}/${${current_pwd:t}//\%/%%}" -fi - -unset current_pwd - -print "$ret_directory" - -} -function prompt_sorin_precmd { - setopt LOCAL_OPTIONS - unsetopt XTRACE KSH_ARRAYS - - # Format PWD. - # PWD taken from Prezto - _prompt_sorin_pwd=$(prompt-pwd) - - # Handle updating git data. We also clear the git prompt data if we're in a - # different git root now. - if (( $+functions[git-dir] )); then - local new_git_root="$(git-dir 2> /dev/null)" - if [[ $new_git_root != $_sorin_cur_git_root ]]; then - _prompt_sorin_git=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` - _sorin_cur_git_root=$new_git_root - fi - fi - - # Run python info (this should be fast and not require any async) - if (( $+functions[python-info] )); then - python-info - fi -} - -function prompt_sorin_setup { - setopt LOCAL_OPTIONS - unsetopt XTRACE KSH_ARRAYS - prompt_opts=(cr percent sp subst) - # Add hook for calling git-info before each command. - add-zsh-hook precmd prompt_sorin_precmd - - - - # Set up non-zero return value display - local show_return="✘ " - - # Get the async worker set up - _sorin_cur_git_root='' - - _prompt_sorin_git='' - _prompt_sorin_pwd='' - # Define prompts. - PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{10}> ' - RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}' - RPROMPT+=${show_return} - RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}' - # SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? ' -} - -function prompt_sorin_preview { - local +h PROMPT='' - local +h RPROMPT='' - local +h SPROMPT='' - - editor-info 2> /dev/null - prompt_preview_theme 'sorin' -} - -prompt_sorin_setup "$@" From 4440be44e834be6dacc359e4a26cca9d98499c24 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:39:49 -0700 Subject: [PATCH 09/13] Added Sorin Prompt --- modules/prompt/functions/prompt_sorin_setup | 117 ++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100755 modules/prompt/functions/prompt_sorin_setup diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup new file mode 100755 index 0000000..b662b2e --- /dev/null +++ b/modules/prompt/functions/prompt_sorin_setup @@ -0,0 +1,117 @@ +# +# A simple theme that displays relevant, contextual information. +# +# Authors: +# Sorin Ionescu +# +# Screenshots: +# http://i.imgur.com/nrGV6pg.png +# + +# +# 16 Terminal Colors +# -- --------------- +# 0 black +# 1 red +# 2 green +# 3 yellow +# 4 blue +# 5 magenta +# 6 cyan +# 7 white +# 8 bright black +# 9 bright red +# 10 bright green +# 11 bright yellow +# 12 bright blue +# 13 bright magenta +# 14 bright cyan +# 15 bright white +# + +function prompt_sorin_git { + cd -q "$1" + echo `git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` +} +function prompt-pwd { + +setopt localoptions extendedglob + +local current_pwd="${PWD/#$HOME/~}" +local ret_directory + +if [[ "$current_pwd" == (#m)[/~] ]]; then + ret_directory="$MATCH" + unset MATCH +elif zstyle -m ':zim:module:prompt' pwd-length 'full'; then + ret_directory=${PWD} +elif zstyle -m ':zim:module:prompt' pwd-length 'long'; then + ret_directory=${current_pwd} +else + ret_directory="${${${${(@j:/:M)${(@s:/:)current_pwd}##.#?}:h}%/}//\%/%%}/${${current_pwd:t}//\%/%%}" +fi + +unset current_pwd + +print "$ret_directory" + +} +function prompt_sorin_precmd { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + + # Format PWD. + # PWD taken from Prezto + _prompt_sorin_pwd=$(prompt-pwd) + + # Handle updating git data. We also clear the git prompt data if we're in a + # different git root now. + if (( $+functions[git-dir] )); then + local new_git_root="$(git-dir 2> /dev/null)" + if [[ $new_git_root != $_sorin_cur_git_root ]]; then + _prompt_sorin_git=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` + _sorin_cur_git_root=$new_git_root + fi + fi + + # Run python info (this should be fast and not require any async) + if (( $+functions[python-info] )); then + python-info + fi +} + +function prompt_sorin_setup { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + prompt_opts=(cr percent sp subst) + # Add hook for calling git-info before each command. + add-zsh-hook precmd prompt_sorin_precmd + + + + # Set up non-zero return value display + local show_return="✘ " + + # Get the async worker set up + _sorin_cur_git_root='' + + _prompt_sorin_git='' + _prompt_sorin_pwd='' + # Define prompts. + PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{10}> ' + RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}' + RPROMPT+=${show_return} + RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}' + # SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? ' +} + +function prompt_sorin_preview { + local +h PROMPT='' + local +h RPROMPT='' + local +h SPROMPT='' + + editor-info 2> /dev/null + prompt_preview_theme 'sorin' +} + +prompt_sorin_setup "$@" From 90e3a51c2fad2d0a3cbd78768ded6f26b876e309 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:40:37 -0700 Subject: [PATCH 10/13] Got Rid of Changes to init.zsh for this branch --- init.zsh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/init.zsh b/init.zsh index bfc0f85..0ee95ed 100755 --- a/init.zsh +++ b/init.zsh @@ -34,14 +34,6 @@ fi for zmodule (${zmodules}); do if [[ -s ${ZIM_HOME}/modules/${zmodule}/init.zsh ]]; then source ${ZIM_HOME}/modules/${zmodule}/init.zsh - elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.plugin.zsh - elif [[ -s ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}/${zmodule}.zsh - elif [[ -s ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.plugin.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.plugin.zsh - elif [[ -s ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.zsh ]]; then - source ${ZIM_HOME}/modules/${zmodule}/zsh-${zmodule}.zsh elif [[ ! -d ${ZIM_HOME}/modules/${zmodule} ]]; then print "No such module \"${zmodule}\"." >&2 fi From 4fe3dca58914aae0767f74087fd4571b6e8429a1 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:43:26 -0700 Subject: [PATCH 11/13] Removed backticks --- modules/prompt/functions/prompt_sorin_setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup index b662b2e..3b662db 100755 --- a/modules/prompt/functions/prompt_sorin_setup +++ b/modules/prompt/functions/prompt_sorin_setup @@ -31,7 +31,7 @@ function prompt_sorin_git { cd -q "$1" - echo `git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` + echo $(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') } function prompt-pwd { From 5759379e67f1a143be15af67a897570bb15371fc Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 29 Mar 2018 17:46:55 -0700 Subject: [PATCH 12/13] Removed backticks (again) --- modules/prompt/functions/prompt_sorin_setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup index 3b662db..02bde79 100755 --- a/modules/prompt/functions/prompt_sorin_setup +++ b/modules/prompt/functions/prompt_sorin_setup @@ -69,7 +69,7 @@ function prompt_sorin_precmd { if (( $+functions[git-dir] )); then local new_git_root="$(git-dir 2> /dev/null)" if [[ $new_git_root != $_sorin_cur_git_root ]]; then - _prompt_sorin_git=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'` + _prompt_sorin_git$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') _sorin_cur_git_root=$new_git_root fi fi From 41d6ff3a5bfb480268492a75e3c220a3916b0361 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Sat, 31 Mar 2018 11:02:01 -0700 Subject: [PATCH 13/13] Fixes to Git coloring and stopped Coloring Leak --- modules/prompt/functions/prompt_sorin_setup | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup index 02bde79..0f5a963 100755 --- a/modules/prompt/functions/prompt_sorin_setup +++ b/modules/prompt/functions/prompt_sorin_setup @@ -29,10 +29,6 @@ # 15 bright white # -function prompt_sorin_git { - cd -q "$1" - echo $(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') -} function prompt-pwd { setopt localoptions extendedglob @@ -69,7 +65,7 @@ function prompt_sorin_precmd { if (( $+functions[git-dir] )); then local new_git_root="$(git-dir 2> /dev/null)" if [[ $new_git_root != $_sorin_cur_git_root ]]; then - _prompt_sorin_git$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') + _prompt_sorin_git=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') _sorin_cur_git_root=$new_git_root fi fi @@ -98,10 +94,10 @@ function prompt_sorin_setup { _prompt_sorin_git='' _prompt_sorin_pwd='' # Define prompts. - PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{10}> ' + PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{2}>%f ' RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}' RPROMPT+=${show_return} - RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}' + RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}%F{4}${_prompt_sorin_git}%f' # SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? ' }