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

Merge pull request #394 from Askaiant/python-venv

Browse Source 
Add OMB_THEME_SHOW_PYTHON_VENV
This commit is contained in:
Koichi Murase
2023-02-11 21:19:31 -08:00
committed by GitHub
parent 59f6ef145b 096ff01f40
commit 867d1e6336
11 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+14
View File
@@ -218,6 +218,20 @@ If you would like to replace an existing module (theme/plugin/aliases/complet) b
### 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`
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`.
lib/omb-prompt-base.sh
+2
View File
@@ -467,6 +467,8 @@ function _omb_prompt_get_python_version {
}
function _omb_prompt_get_python_venv {
python_venv=
[[ ${OMB_PROMPT_SHOW_PYTHON_VENV-} == true ]] || return 1
local virtualenv condaenv
_omb_prompt_get_virtualenv
_omb_prompt_get_condaenv
templates/bashrc.osh-template
+4
View File
@@ -64,6 +64,10 @@ OSH_THEME="font"
# this variable. The default behavior for the empty value is "true".
OMB_USE_SUDO=true
# To enable/disable display of Python virtualenv and condaenv
# 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/*)
# Custom completions may be added to ~/.oh-my-bash/custom/completions/
# Example format: completions=(ssh git bundler gem pip pip3)
themes/cupcake/cupcake.theme.sh
+2 -2
View File
@@ -13,8 +13,8 @@
# virtualenv prompts
VIRTUALENV_CHAR="ⓔ "
VIRTUALENV_THEME_PROMPT_PREFIX=""
VIRTUALENV_THEME_PROMPT_SUFFIX=""
OMB_PROMPT_VIRTUALENV_FORMAT='%s'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
# SCM prompts
SCM_NONE_CHAR=""
themes/doubletime/doubletime.theme.sh
+2 -2
View File
@@ -19,8 +19,8 @@ if [ ! -z $VIRTUALENV_THEME_PROMPT_COLOR ]; then
else
VIRTUALENV_THEME_PROMPT_COLOR="${_omb_prompt_green}"
fi
VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${_omb_prompt_normal}: "
VIRTUALENV_THEME_PROMPT_SUFFIX=") "
OMB_PROMPT_VIRTUALENV_FORMAT="(${VIRTUALENV_THEME_PROMPT_COLOR}py${_omb_prompt_normal}: %s) "
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then
THEME_PROMPT_HOST_COLOR=$(eval echo $`echo ${THEME_PROMPT_HOST_COLOR}`);
themes/font/font.theme.sh
+2 -2
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_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
VIRTUALENV_THEME_PROMPT_PREFIX='('
VIRTUALENV_THEME_PROMPT_SUFFIX=') '
OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
function _omb_theme_PROMPT_COMMAND() {
# This needs to be first to save last command return code
themes/garo/garo.theme.sh
+8 -8
View File
@@ -21,15 +21,15 @@
# 07:45:05 (venv) user@host ~ →
#
export SCM_NONE_CHAR=''
export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
export SCM_THEME_PROMPT_CLEAN=""
export SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|"
export SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
export SCM_GIT_SHOW_MINIMAL_INFO=true
SCM_NONE_CHAR=''
SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
SCM_THEME_PROMPT_CLEAN=""
SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|"
SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
SCM_GIT_SHOW_MINIMAL_INFO=true
export VIRTUALENV_THEME_PROMPT_PREFIX='('
export VIRTUALENV_THEME_PROMPT_SUFFIX=') '
OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
function _omb_theme_PROMPT_COMMAND() {
# This needs to be first to save last command return code
themes/hawaii50/hawaii50.theme.sh
+2 -2
View File
@@ -66,8 +66,8 @@ RVM_THEME_PROMPT_PREFIX=''
RVM_THEME_PROMPT_SUFFIX=''
# virtualenv prompts
VIRTUALENV_THEME_PROMPT_PREFIX=''
VIRTUALENV_THEME_PROMPT_SUFFIX=''
OMB_PROMPT_VIRTUALENV_FORMAT='%s'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
VIRTUAL_THEME_PROMPT_PREFIX=' using '
VIRTUAL_THEME_PROMPT_SUFFIX=''
themes/luan/luan.theme.sh
+14 -11
View File
@@ -10,20 +10,23 @@ GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
GIT_THEME_PROMPT_PREFIX="(${_omb_prompt_olive}"
GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_normal})"
RVM_THEME_PROMPT_PREFIX=""
RVM_THEME_PROMPT_SUFFIX=""
OMB_PROMPT_RVM_FORMAT="%s"
OMB_PROMPT_VIRTUALENV_FORMAT='(%s) '
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=false}
function _omb_theme_PROMPT_COMMAND() {
dtime="$(clock_prompt)"
user_host="${_omb_prompt_green}\u@${_omb_prompt_teal}\h${_omb_prompt_normal}"
current_dir="${_omb_prompt_bold_navy}\w${_omb_prompt_normal}"
rvm_ruby="${_omb_prompt_bold_brown}$(_omb_prompt_print_ruby_env)${_omb_prompt_normal}"
git_branch="$(scm_prompt_info)${_omb_prompt_normal}"
prompt="${_omb_prompt_bold_green}\$${_omb_prompt_normal} "
arrow="${_omb_prompt_bold_white}▶${_omb_prompt_normal} "
prompt="${_omb_prompt_bold_green}\$${_omb_prompt_normal} "
local dtime="$(clock_prompt)"
local user_host="${_omb_prompt_green}\u@${_omb_prompt_teal}\h${_omb_prompt_normal}"
local current_dir="${_omb_prompt_bold_navy}\w${_omb_prompt_normal}"
local ruby_env python_venv
_omb_prompt_get_ruby_env && ruby_env="$_omb_prompt_bold_brown$ruby_env$_omb_prompt_normal "
_omb_prompt_get_python_venv
local git_branch="$(scm_prompt_info)${_omb_prompt_normal}"
local prompt="${_omb_prompt_bold_green}\$${_omb_prompt_normal} "
local arrow="${_omb_prompt_bold_white}▶${_omb_prompt_normal} "
local prompt="${_omb_prompt_bold_green}\$${_omb_prompt_normal} "
PS1="${dtime}${user_host}:${current_dir} ${rvm_ruby} ${git_branch}
PS1="${dtime}${user_host}:${current_dir} ${python_venv}${ruby_env}${git_branch}
$arrow $prompt"
}
themes/pzq/pzq.theme.sh
+1
View File
@@ -8,6 +8,7 @@
OMB_PROMPT_CONDAENV_FORMAT='(%s)'
OMB_PROMPT_VIRTUALENV_FORMAT='(%s)'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
# ----------------------------------------------------------------- COLOR CONF
D_DEFAULT_COLOR="$_omb_prompt_white"
themes/tylenol/tylenol.theme.sh
+2 -2
View File
@@ -10,8 +10,8 @@ SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_olive}|"
RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|"
VIRTUALENV_THEME_PROMPT_PREFIX='|'
VIRTUALENV_THEME_PROMPT_SUFFIX='|'
OMB_PROMPT_VIRTUALENV_FORMAT='|%s|'
OMB_PROMPT_SHOW_PYTHON_VENV=${OMB_PROMPT_SHOW_PYTHON_VENV:=true}
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} "