From 167dc43a87652f60e6cac97de2be2509356ac7f8 Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Wed, 18 Mar 2020 14:07:22 +0800
Subject: [PATCH 1/4] envy theme add python virtual_env display support.

---
 themes/envy/envy.theme.bash | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/themes/envy/envy.theme.bash b/themes/envy/envy.theme.bash
index 277e3751..ae8e411b 100644
--- a/themes/envy/envy.theme.bash
+++ b/themes/envy/envy.theme.bash
@@ -6,11 +6,24 @@ SCM_THEME_PROMPT_SUFFIX="${green}|"
 
 GIT_THEME_PROMPT_DIRTY=" ${red}✗"
 GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-GIT_THEME_PROMPT_PREFIX=" ${green}|"
+GIT_THEME_PROMPT_PREFIX=" ${green}| "
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
+# virtualenv prompts
+VIRTUALENV_CHAR="ⓔ "
+VIRTUALENV_THEME_PROMPT_PREFIX=""
+VIRTUALENV_THEME_PROMPT_SUFFIX=""
+
+# Display virtual environment info
+function virtualenv_prompt {
+  if [[ -n "$VIRTUAL_ENV" ]]; then
+    virtualenv=`basename "$VIRTUAL_ENV"`
+    echo -e "$VIRTUALENV_CHAR$virtualenv "
+  fi
+}
+
 function prompt_command() {
-    PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n${yellow}$(virtualenv_prompt)${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command

From 7f8652999b4848ef819557b9f40b34d6fb9ccbbc Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Thu, 19 Mar 2020 21:27:54 +0800
Subject: [PATCH 2/4] fix code review issues.

---
 themes/envy/envy.theme.bash | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/themes/envy/envy.theme.bash b/themes/envy/envy.theme.bash
index ae8e411b..f4f09be8 100644
--- a/themes/envy/envy.theme.bash
+++ b/themes/envy/envy.theme.bash
@@ -6,24 +6,14 @@ SCM_THEME_PROMPT_SUFFIX="${green}|"
 
 GIT_THEME_PROMPT_DIRTY=" ${red}✗"
 GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-GIT_THEME_PROMPT_PREFIX=" ${green}| "
+GIT_THEME_PROMPT_PREFIX=" ${green}|"
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
-# virtualenv prompts
-VIRTUALENV_CHAR="ⓔ "
-VIRTUALENV_THEME_PROMPT_PREFIX=""
+VIRTUALENV_THEME_PROMPT_PREFIX="${green}ⓔ  "
 VIRTUALENV_THEME_PROMPT_SUFFIX=""
 
-# Display virtual environment info
-function virtualenv_prompt {
-  if [[ -n "$VIRTUAL_ENV" ]]; then
-    virtualenv=`basename "$VIRTUAL_ENV"`
-    echo -e "$VIRTUALENV_CHAR$virtualenv "
-  fi
-}
-
 function prompt_command() {
-    PS1="\n${yellow}$(virtualenv_prompt)${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n$(virtualenv_prompt)${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command

From fd162c078695dadc2a42d6cdf817811de3b52bde Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Fri, 20 Mar 2020 09:44:06 +0800
Subject: [PATCH 3/4] add RUBY_VERSION_PROMPT_DISABLED parameter for PS1
 prompt.

---
 themes/base.theme.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index d5858018..5e31d7ca 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -371,7 +371,9 @@ function chruby_version_prompt {
 }
 
 function ruby_version_prompt {
-  echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
+  if [ -z "${RUBY_VERSION_PROMPT_DISABLED}" ]; then
+    echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
+  fi
 }
 
 function k8s_context_prompt {

From 21885dabb4e4f858736de906468bd5bc0193955f Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Fri, 20 Mar 2020 19:25:45 +0800
Subject: [PATCH 4/4] add THEME_SHOW_RUBY_PROMPT.

---
 themes/base.theme.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 5e31d7ca..7452eb9f 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -68,6 +68,8 @@ NVM_THEME_PROMPT_SUFFIX='|'
 RVM_THEME_PROMPT_PREFIX=' |'
 RVM_THEME_PROMPT_SUFFIX='|'
 
+THEME_SHOW_RUBY_PROMPT=${THEME_SHOW_RUBY_PROMPT:=true}
+
 THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
 USER_HOST_THEME_PROMPT_PREFIX=''
 USER_HOST_THEME_PROMPT_SUFFIX=''
@@ -371,7 +373,7 @@ function chruby_version_prompt {
 }
 
 function ruby_version_prompt {
-  if [ -z "${RUBY_VERSION_PROMPT_DISABLED}" ]; then
+  if [[ "${THEME_SHOW_RUBY_PROMPT}" = "true" ]]; then
     echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
   fi
 }