From 5e65235d0ebd44cab4e494c64363bb6babefda84 Mon Sep 17 00:00:00 2001
From: BarbUk <BarbUk@users.noreply.github.com>
Date: Tue, 20 Oct 2020 23:27:48 +0200
Subject: [PATCH] Theme barbuk - add venv glyph and fix venv display in ssh
 mode (#1681)

* Add python venv glyph

* Fix venv display (tested for local and ssh prompt)

* Add documentation for python venv
---
 themes/barbuk/README.md         | 7 +++++++
 themes/barbuk/barbuk.theme.bash | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 87d23bad..fdc60719 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -29,6 +29,7 @@ BARBUK_GIT_BRANCH_ICON=''
 BARBUK_HG_CHAR='☿ '
 BARBUK_SVN_CHAR='⑆ '
 BARBUK_EXIT_CODE_ICON=' '
+BARBUK_PYTHON_VENV_CHAR=' '
 ```
 
 ### Customize glyphs
@@ -97,3 +98,9 @@ chmod 400 /etc/sudoers.d/keepenv
 ```bash
 user@hostname in  ~/bash-it on  master ✓ ❯
 ```
+
+### Python venv
+
+```bash
+  flask ~/test on  master ✓ ❯
+```
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 75790337..e1e7f2c1 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -10,6 +10,7 @@ SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
 SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
 SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
 EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
+PYTHON_VENV_CHAR=${BARBUK_PYTHON_VENV_CHAR:=' '}
 
 # Ssh user and hostname display
 SSH_INFO=${BARBUK_SSH_INFO:=true}
@@ -90,12 +91,12 @@ function _prompt {
 
     # Detect python venv
     if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-        python_venv="${CONDA_DEFAULT_ENV}"
+        python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
     elif [[ -n "${VIRTUAL_ENV}" ]]; then
-        python_venv=$(basename "${VIRTUAL_ENV}")
+        python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
     fi
 
-    PS1="\\n${ssh_info} ${python_venv} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
+    PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
 
     [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
     PS1="${PS1}${wrap_char}❯${normal} "