themes/sexy: Support OMB_PROMPT_SHOW_PYTHON_VENV

This commit is contained in:
Koichi Murase
2023-02-12 16:20:34 +09:00
parent 6e7a306d3e
commit 55a31c6b96
2 changed files with 17 additions and 6 deletions

View File

@@ -75,7 +75,9 @@ CHRUBY_THEME_PROMPT_SUFFIX='|'
# # new # # new
# OMB_PROMPT_VIRTUALENV_FORMAT=' |%s|' # OMB_PROMPT_VIRTUALENV_FORMAT=' |%s|'
# OMB_PROMPT_CONDAENV_FORMAT=' |%s|' # OMB_PROMPT_CONDAENV_FORMAT=' |%s|'
# OMB_PROMPT_CONDAENV_USE_BASENAME=true
# OMB_PROMPT_PYTHON_VERSION_FORMAT=' |%s|' # OMB_PROMPT_PYTHON_VERSION_FORMAT=' |%s|'
# OMB_PROMPT_SHOW_PYTHON_VENV=true
# deprecate # deprecate
VIRTUALENV_THEME_PROMPT_PREFIX=' |' VIRTUALENV_THEME_PROMPT_PREFIX=' |'
@@ -456,8 +458,13 @@ function _omb_prompt_get_virtualenv {
function _omb_prompt_get_condaenv { function _omb_prompt_get_condaenv {
condaenv= condaenv=
[[ ${CONDA_DEFAULT_ENV-} ]] || return 1 [[ ${CONDA_DEFAULT_ENV-} && ${CONDA_SHLVL-} != 0 ]] || return 1
_omb_prompt_format condaenv "$CONDA_DEFAULT_ENV" OMB_PROMPT_CONDAENV:CONDAENV_THEME_PROMPT
local condaenv=$CONDA_DEFAULT_ENV
if [[ ${OMB_PROMPT_CONDAENV_USE_BASENAME-} == true ]]; then
condaenv=$(basename "$condaenv")
fi
_omb_prompt_format condaenv "$condaenv" OMB_PROMPT_CONDAENV:CONDAENV_THEME_PROMPT
} }
function _omb_prompt_get_python_version { function _omb_prompt_get_python_version {

View File

@@ -3,6 +3,11 @@
# Screenshot: http://cloud.gf3.ca/M5rG # Screenshot: http://cloud.gf3.ca/M5rG
# A big thanks to \amethyst on Freenode # A big thanks to \amethyst on Freenode
OMB_PROMPT_VIRTUALENV_FORMAT=$_omb_prompt_bold_silver'<%s> '
OMB_PROMPT_CONDAENV_FORMAT=$_omb_prompt_bold_silver'<%s> '
OMB_PROMPT_CONDAENV_USE_BASENAME=true
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=false}
if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color &>/dev/null; then if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color &>/dev/null; then
export TERM=gnome-256color export TERM=gnome-256color
elif [[ $TERM != dumb ]] && infocmp xterm-256color &>/dev/null; then elif [[ $TERM != dumb ]] && infocmp xterm-256color &>/dev/null; then
@@ -43,10 +48,9 @@ function parse_git_branch {
} }
function _omb_theme_PROMPT_COMMAND() { function _omb_theme_PROMPT_COMMAND() {
PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]" local python_venv
if [[ $CONDA_SHLVL == 1 ]]; then _omb_prompt_get_python_venv
PS1="\[${BOLD}${WHITE}\]<$(basename $CONDA_DEFAULT_ENV)> $PS1" PS1="$python_venv\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
fi
} }
_omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND