shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

themes: Show the "conda" environment with "virtualenv"

Browse Source
This commit is contained in:
Koichi Murase
2021-12-27 23:52:37 +09:00
parent 77e5874e62
commit 1401e86e9f
8 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
themes/cupcake/cupcake.theme.sh
View File

@@ -63,7 +63,7 @@ function winname {
# Displays the current prompt
function prompt_command() {
PS1="\n${icon_start}$(virtualenv_prompt)${icon_user}${bold_red}\u${normal}${icon_host}${bold_cyan}\h${normal}${icon_directory}${bold_purple}\W${normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch} \")${white}$(scm_prompt_info)${normal}\n${icon_end}"
PS1="\n${icon_start}$(_omb_prompt_print_python_venv)${icon_user}${bold_red}\u${normal}${icon_host}${bold_cyan}\h${normal}${icon_directory}${bold_purple}\W${normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch} \")${white}$(scm_prompt_info)${normal}\n${icon_end}"
PS2="${icon_end}"
}

2
themes/doubletime/doubletime.theme.sh
View File

@@ -45,7 +45,7 @@ function prompt_setter() {
history -c
history -r
PS1="
$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(ruby_version_prompt)\w
$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}$reset_color] $(_omb_prompt_print_python_venv)$(ruby_version_prompt)\w
$(doubletime_scm_prompt)$reset_color $ "
PS2='> '
PS4='+ '

2
themes/doubletime_multiline/doubletime_multiline.theme.sh
View File

@@ -8,7 +8,7 @@ function prompt_setter() {
history -c
history -r
PS1="
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(ruby_version_prompt)
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(_omb_prompt_print_python_venv)$(ruby_version_prompt)
\w
$(doubletime_scm_prompt)$reset_color $ "
PS2='> '

2
themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.sh
View File

@@ -8,7 +8,7 @@ function prompt_setter() {
history -c
history -r
PS1="
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(_omb_prompt_print_python_venv)
\w
$(doubletime_scm_prompt)$reset_color $ "
PS2='> '

19
themes/font/font.theme.sh
View File

@@ -37,24 +37,13 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
VIRTUALENV_THEME_PROMPT_PREFIX='('
VIRTUALENV_THEME_PROMPT_SUFFIX=') '
function _python_venv_prompt {
local python_venv=""
if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
python_venv="${CONDA_DEFAULT_ENV}"
elif [[ -n "${VIRTUAL_ENV}" ]]; then
python_venv=$(basename "${VIRTUAL_ENV}")
fi
[[ -n "${python_venv}" ]] && echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$python_venv$VIRTUALENV_THEME_PROMPT_SUFFIX"
}
function prompt_command() {
# This needs to be first to save last command return code
local RC="$?"
hostname="${bold_black}\u@\h"
virtualenv="${white}$(_python_venv_prompt)"
local hostname="${bold_black}\u@\h"
local python_venv; _omb_prompt_get_python_venv
python_venv=$white$python_venv
# Set return status color
if [[ ${RC} == 0 ]]; then
@@ -66,7 +55,7 @@ function prompt_command() {
# Append new history lines to history file
history -a
PS1="$(clock_prompt)${virtualenv}${hostname} ${bold_cyan}\W $(scm_prompt_char_info)${ret_status}→ ${normal}"
PS1="$(clock_prompt)$python_venv${hostname} ${bold_cyan}\W $(scm_prompt_char_info)${ret_status}→ ${normal}"
}
safe_append_prompt_command prompt_command

7
themes/garo/garo.theme.sh
View File

@@ -35,8 +35,9 @@ function prompt_command() {
# This needs to be first to save last command return code
local RC="$?"
hostname="${bold_black}\u"
virtualenv="${white}$(virtualenv_prompt)"
local hostname="${bold_black}\u"
local python_venv; _omb_prompt_get_python_venv
python_venv=$white$python_venv
# Set return status color
if [[ ${RC} == 0 ]]; then
@@ -48,7 +49,7 @@ function prompt_command() {
# Append new history lines to history file
history -a
PS1="${virtualenv}${hostname} ${bold_cyan}\w $(scm_prompt_char_info)${ret_status}→ ${normal}"
PS1="$python_venv${hostname} ${bold_cyan}\w $(scm_prompt_char_info)${ret_status}→ ${normal}"
}
safe_append_prompt_command prompt_command

8
themes/hawaii50/hawaii50.theme.sh
View File

@@ -97,7 +97,7 @@ function ip_prompt_info() {
# Displays virtual info prompt (virtualenv/rvm)
function virtual_prompt_info() {
local virtual_env_info=$(virtualenv_prompt)
local python_venv; _omb_prompt_get_python_venv
local rvm_info=$(ruby_version_prompt)
local virtual_prompt=""
@@ -105,14 +105,14 @@ function virtual_prompt_info() {
local suffix=${VIRTUAL_THEME_PROMPT_SUFFIX}
# If no virtual info, just return
[[ -z "$virtual_env_info" && -z "$rvm_info" ]] && return
[[ -z "$python_venv" && -z "$rvm_info" ]] && return
# If virtual_env info present, append to prompt
[[ -n "$virtual_env_info" ]] && virtual_prompt="virtualenv: ${VE_COLOR}$virtual_env_info${DEFAULT_COLOR}"
[[ -n "$python_venv" ]] && virtual_prompt="virtualenv: ${VE_COLOR}$python_venv${DEFAULT_COLOR}"
if [[ -n "$rvm_info" ]]
then
[[ -n "$virtual_env_info" ]] && virtual_prompt="$virtual_prompt, "
[[ -n "$python_venv" ]] && virtual_prompt="$virtual_prompt, "
virtual_prompt="${virtual_prompt}rvm: ${RVM_COLOR}$rvm_info${DEFAULT_COLOR}"
fi
echo -e "$prefix$virtual_prompt$suffix"

4
themes/tylenol/tylenol.theme.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Based on 'bobby' theme with the addition of virtualenv_prompt
# Based on 'bobby' theme with the addition of python_venv
#
SCM_THEME_PROMPT_DIRTY=" ${red}✗"
@@ -14,7 +14,7 @@ VIRTUALENV_THEME_PROMPT_PREFIX='|'
VIRTUALENV_THEME_PROMPT_SUFFIX='|'
function prompt_command() {
PS1="\n${green}$(virtualenv_prompt)${red}$(ruby_version_prompt) ${reset_color}\h ${orange}in ${reset_color}\w\n${yellow}$(scm_char)$(scm_prompt_info) ${yellow}→${white} "
PS1="\n${green}$(_omb_prompt_print_python_venv)${red}$(ruby_version_prompt) ${reset_color}\h ${orange}in ${reset_color}\w\n${yellow}$(scm_char)$(scm_prompt_info) ${yellow}→${white} "
}
safe_append_prompt_command prompt_command