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: Specify default OMB_PROMPT_SHOW_PYTHON_VENV for each theme

Browse Source
This commit is contained in:
Koichi Murase
2023-02-10 12:23:13 +09:00
parent e3ecc9738c
commit 7a54475d48
11 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@@ -218,6 +218,20 @@ If you would like to replace an existing module (theme/plugin/aliases/complet) b
### Configuration ### Configuration
#### Enable/disable python venv
The python virtualenv/condaenv information in the prompt may be enabled by the following line in `~/.bashrc`.
```bash
OMB_PROMPT_SHOW_PYTHON_VENV=true
```
Some themes turn on it by default. If you would like to turn it off, you may disable it by the following line in `~/.bashrc`:
```bash
OMB_PROMPT_SHOW_PYTHON_VENV=false
```
#### Disable internal uses of `sudo` #### Disable internal uses of `sudo`
Some plugins of oh-my-bash internally use `sudo` when it is necessary. However, this might clutter with the `sudo` log. To disable the use of `sudo` by oh-my-bash, `OMB_USE_SUDO` can be set to `false` in `~/.bashrc`. Some plugins of oh-my-bash internally use `sudo` when it is necessary. However, this might clutter with the `sudo` log. To disable the use of `sudo` by oh-my-bash, `OMB_USE_SUDO` can be set to `false` in `~/.bashrc`.

2
lib/omb-prompt-base.sh
View File

@@ -85,8 +85,6 @@ CONDAENV_THEME_PROMPT_SUFFIX='|'
PYTHON_THEME_PROMPT_PREFIX=' |' PYTHON_THEME_PROMPT_PREFIX=' |'
PYTHON_THEME_PROMPT_SUFFIX='|' PYTHON_THEME_PROMPT_SUFFIX='|'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
## @fn _omb_prompt_format var value fmt_prefix[:deprecated] ## @fn _omb_prompt_format var value fmt_prefix[:deprecated]
## @param[in] var ## @param[in] var
## @param[in] value ## @param[in] value

5
templates/bashrc.osh-template
View File

@@ -64,8 +64,9 @@ OSH_THEME="font"
# this variable. The default behavior for the empty value is "true". # this variable. The default behavior for the empty value is "true".
OMB_USE_SUDO=true OMB_USE_SUDO=true
# To disable display of Python virtualenv # To enable/disable display of Python virtualenv and condaenv
# OMB_PROMPT_SHOW_PYTHON_VENV=false # OMB_PROMPT_SHOW_PYTHON_VENV=true # enable
# OMB_PROMPT_SHOW_PYTHON_VENV=false # disable
# Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*) # Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*)
# Custom completions may be added to ~/.oh-my-bash/custom/completions/ # Custom completions may be added to ~/.oh-my-bash/custom/completions/

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

@@ -13,8 +13,8 @@
# virtualenv prompts # virtualenv prompts
VIRTUALENV_CHAR="ⓔ " VIRTUALENV_CHAR="ⓔ "
VIRTUALENV_THEME_PROMPT_PREFIX="" OMB_PROMPT_VIRTUALENV_FORMAT='%s'
VIRTUALENV_THEME_PROMPT_SUFFIX="" OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
# SCM prompts # SCM prompts
SCM_NONE_CHAR="" SCM_NONE_CHAR=""

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

@@ -19,8 +19,8 @@ if [ ! -z $VIRTUALENV_THEME_PROMPT_COLOR ]; then
else else
VIRTUALENV_THEME_PROMPT_COLOR="${_omb_prompt_green}" VIRTUALENV_THEME_PROMPT_COLOR="${_omb_prompt_green}"
fi fi
VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${_omb_prompt_normal}: " OMB_PROMPT_VIRTUALENV_FORMAT="(${VIRTUALENV_THEME_PROMPT_COLOR}py${_omb_prompt_normal}: %s) "
VIRTUALENV_THEME_PROMPT_SUFFIX=") " OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then
THEME_PROMPT_HOST_COLOR=$(eval echo $`echo ${THEME_PROMPT_HOST_COLOR}`); THEME_PROMPT_HOST_COLOR=$(eval echo $`echo ${THEME_PROMPT_HOST_COLOR}`);

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

@@ -34,8 +34,8 @@ THEME_SHOW_CLOCK=${THEME_SHOW_CLOCK:-"true"}
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_navy"} THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_navy"}
THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"} THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
VIRTUALENV_THEME_PROMPT_PREFIX='(' OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
VIRTUALENV_THEME_PROMPT_SUFFIX=') ' OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
function _omb_theme_PROMPT_COMMAND() { function _omb_theme_PROMPT_COMMAND() {
# This needs to be first to save last command return code # This needs to be first to save last command return code

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

@@ -21,15 +21,15 @@
# 07:45:05 (venv) user@host ~ → # 07:45:05 (venv) user@host ~ →
# #
export SCM_NONE_CHAR='' SCM_NONE_CHAR=''
export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗" SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
export SCM_THEME_PROMPT_CLEAN="" SCM_THEME_PROMPT_CLEAN=""
export SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|" SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|"
export SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|" SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
export SCM_GIT_SHOW_MINIMAL_INFO=true SCM_GIT_SHOW_MINIMAL_INFO=true
export VIRTUALENV_THEME_PROMPT_PREFIX='(' OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
export VIRTUALENV_THEME_PROMPT_SUFFIX=') ' OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
function _omb_theme_PROMPT_COMMAND() { function _omb_theme_PROMPT_COMMAND() {
# This needs to be first to save last command return code # This needs to be first to save last command return code

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

@@ -66,8 +66,8 @@ RVM_THEME_PROMPT_PREFIX=''
RVM_THEME_PROMPT_SUFFIX='' RVM_THEME_PROMPT_SUFFIX=''
# virtualenv prompts # virtualenv prompts
VIRTUALENV_THEME_PROMPT_PREFIX='' OMB_PROMPT_VIRTUALENV_FORMAT='%s'
VIRTUALENV_THEME_PROMPT_SUFFIX='' OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
VIRTUAL_THEME_PROMPT_PREFIX=' using ' VIRTUAL_THEME_PROMPT_PREFIX=' using '
VIRTUAL_THEME_PROMPT_SUFFIX='' VIRTUAL_THEME_PROMPT_SUFFIX=''

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

@@ -10,8 +10,8 @@ GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
GIT_THEME_PROMPT_PREFIX="(${_omb_prompt_olive}" GIT_THEME_PROMPT_PREFIX="(${_omb_prompt_olive}"
GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_normal})" GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_normal})"
VIRTUALENV_THEME_PROMPT_PREFIX='(' OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
VIRTUALENV_THEME_PROMPT_SUFFIX=') ' OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
RVM_THEME_PROMPT_PREFIX="" RVM_THEME_PROMPT_PREFIX=""
RVM_THEME_PROMPT_SUFFIX="" RVM_THEME_PROMPT_SUFFIX=""

1
themes/pzq/pzq.theme.sh
View File

@@ -8,6 +8,7 @@
OMB_PROMPT_CONDAENV_FORMAT='(%s)' OMB_PROMPT_CONDAENV_FORMAT='(%s)'
OMB_PROMPT_VIRTUALENV_FORMAT='(%s)' OMB_PROMPT_VIRTUALENV_FORMAT='(%s)'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
# ----------------------------------------------------------------- COLOR CONF # ----------------------------------------------------------------- COLOR CONF
D_DEFAULT_COLOR="$_omb_prompt_white" D_DEFAULT_COLOR="$_omb_prompt_white"

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

@@ -10,8 +10,8 @@ SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_olive}|"
RVM_THEME_PROMPT_PREFIX="|" RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|" RVM_THEME_PROMPT_SUFFIX="|"
VIRTUALENV_THEME_PROMPT_PREFIX='|' OMB_PROMPT_VIRTUALENV_FORMAT='|%s|'
VIRTUALENV_THEME_PROMPT_SUFFIX='|' OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
function _omb_theme_PROMPT_COMMAND() { function _omb_theme_PROMPT_COMMAND() {
PS1="\n${_omb_prompt_green}$(_omb_prompt_print_python_venv)${_omb_prompt_brown}$(_omb_prompt_print_ruby_env) ${_omb_prompt_reset_color}\h ${_omb_prompt_red}in ${_omb_prompt_reset_color}\w\n${_omb_prompt_olive}$(scm_char)$(scm_prompt_info) ${_omb_prompt_olive}→${_omb_prompt_white} " PS1="\n${_omb_prompt_green}$(_omb_prompt_print_python_venv)${_omb_prompt_brown}$(_omb_prompt_print_ruby_env) ${_omb_prompt_reset_color}\h ${_omb_prompt_red}in ${_omb_prompt_reset_color}\w\n${_omb_prompt_olive}$(scm_char)$(scm_prompt_info) ${_omb_prompt_olive}→${_omb_prompt_white} "