Skip to content

Commit 98feecb

Browse files
BarbUkphreakocious
authored andcommitted
Theme barbuk - add venv glyph and fix venv display in ssh mode (Bash-it#1681)
* Add python venv glyph * Fix venv display (tested for local and ssh prompt) * Add documentation for python venv
1 parent 50f2553 commit 98feecb

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

themes/barbuk/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ BARBUK_GIT_BRANCH_ICON=''
2929
BARBUK_HG_CHAR=''
3030
BARBUK_SVN_CHAR=''
3131
BARBUK_EXIT_CODE_ICON=''
32+
BARBUK_PYTHON_VENV_CHAR=''
3233
```
3334

3435
### Customize glyphs
@@ -97,3 +98,9 @@ chmod 400 /etc/sudoers.d/keepenv
9798
```bash
9899
user@hostname in~/bash-it on  master ✓ ❯
99100
```
101+
102+
### Python venv
103+
104+
```bash
105+
  flask ~/test on  master ✓ ❯
106+
```

themes/barbuk/barbuk.theme.bash

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
1010
SCM_HG_CHAR=${BARBUK_HG_CHAR:=''}
1111
SCM_SVN_CHAR=${BARBUK_SVN_CHAR:=''}
1212
EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=''}
13+
PYTHON_VENV_CHAR=${BARBUK_PYTHON_VENV_CHAR:=''}
1314

1415
# Ssh user and hostname display
1516
SSH_INFO=${BARBUK_SSH_INFO:=true}
@@ -90,12 +91,12 @@ function _prompt {
9091

9192
# Detect python venv
9293
if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
93-
python_venv="${CONDA_DEFAULT_ENV}"
94+
python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
9495
elif [[ -n "${VIRTUAL_ENV}" ]]; then
95-
python_venv=$(basename "${VIRTUAL_ENV}")
96+
python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
9697
fi
9798

98-
PS1="\\n${ssh_info} ${python_venv} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
99+
PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
99100

100101
[[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
101102
PS1="${PS1}${wrap_char}${normal} "

0 commit comments

Comments
 (0)