From 185257e9715d3db339e3e616d9ca0ed09a708565 Mon Sep 17 00:00:00 2001 From: 8F3E <39588555+8F3E@users.noreply.github.com> Date: Tue, 22 Sep 2020 11:31:05 +0100 Subject: [PATCH 1/2] Detect python venv and show in prompt --- themes/barbuk/barbuk.theme.bash | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash index 5c5fdf1d..0a15d1e8 100644 --- a/themes/barbuk/barbuk.theme.bash +++ b/themes/barbuk/barbuk.theme.bash @@ -88,7 +88,14 @@ function _prompt { ssh_info="${bold_blue}\u${bold_orange}@${cyan}$host ${bold_orange}in" fi - PS1="\\n${ssh_info} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}" + # Detect python venv + if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then + python_venv="${CONDA_DEFAULT_ENV}" + elif [[ -n "${VIRTUAL_ENV}" ]]; then + python_venv=$(basename "${VIRTUAL_ENV}") + fi + + PS1="\\n${ssh_info} ${python_venv} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}" [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n" PS1="${PS1}${wrap_char}❯${normal} " From 43dfe23d102eda5e862615e57f6f81fa5ebdcdf2 Mon Sep 17 00:00:00 2001 From: 8F3E <39588555+8F3E@users.noreply.github.com> Date: Wed, 23 Sep 2020 11:32:18 +0100 Subject: [PATCH 2/2] Declare python_venv as a local variable --- themes/barbuk/barbuk.theme.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash index 0a15d1e8..75790337 100644 --- a/themes/barbuk/barbuk.theme.bash +++ b/themes/barbuk/barbuk.theme.bash @@ -66,7 +66,7 @@ function _exit-code { } function _prompt { - local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' host + local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' python_venv='' host _exit-code exit_code _git-uptream-remote-logo