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 venvpull/1689/head
parent
c387517122
commit
5e65235d0e
|
|
@ -29,6 +29,7 @@ BARBUK_GIT_BRANCH_ICON=''
|
||||||
BARBUK_HG_CHAR='☿ '
|
BARBUK_HG_CHAR='☿ '
|
||||||
BARBUK_SVN_CHAR='⑆ '
|
BARBUK_SVN_CHAR='⑆ '
|
||||||
BARBUK_EXIT_CODE_ICON=' '
|
BARBUK_EXIT_CODE_ICON=' '
|
||||||
|
BARBUK_PYTHON_VENV_CHAR=' '
|
||||||
```
|
```
|
||||||
|
|
||||||
### Customize glyphs
|
### Customize glyphs
|
||||||
|
|
@ -97,3 +98,9 @@ chmod 400 /etc/sudoers.d/keepenv
|
||||||
```bash
|
```bash
|
||||||
user@hostname in ~/bash-it on master ✓ ❯
|
user@hostname in ~/bash-it on master ✓ ❯
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Python venv
|
||||||
|
|
||||||
|
```bash
|
||||||
|
flask ~/test on master ✓ ❯
|
||||||
|
```
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
|
||||||
SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
|
SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
|
||||||
SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
|
SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
|
||||||
EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
|
EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
|
||||||
|
PYTHON_VENV_CHAR=${BARBUK_PYTHON_VENV_CHAR:=' '}
|
||||||
|
|
||||||
# Ssh user and hostname display
|
# Ssh user and hostname display
|
||||||
SSH_INFO=${BARBUK_SSH_INFO:=true}
|
SSH_INFO=${BARBUK_SSH_INFO:=true}
|
||||||
|
|
@ -90,12 +91,12 @@ function _prompt {
|
||||||
|
|
||||||
# Detect python venv
|
# Detect python venv
|
||||||
if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
|
if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
|
||||||
python_venv="${CONDA_DEFAULT_ENV}"
|
python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
|
||||||
elif [[ -n "${VIRTUAL_ENV}" ]]; then
|
elif [[ -n "${VIRTUAL_ENV}" ]]; then
|
||||||
python_venv=$(basename "${VIRTUAL_ENV}")
|
python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
|
||||||
fi
|
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} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
|
||||||
PS1="${PS1}${wrap_char}❯${normal} "
|
PS1="${PS1}${wrap_char}❯${normal} "
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue