XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into theme_barbuk/add_commmand_time_duration

pull/1683/head
BarbUk 2020-10-21 09:05:21 +02:00
parent 1a6c3330bc 5e65235d0e
commit 02eff64749
No known key found for this signature in database
GPG Key ID: DB301C759539E9FE
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
themes/barbuk/README.md
View File

@ -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=' '
BARBUK_COMMAND_DURATION_ICON='  ' BARBUK_COMMAND_DURATION_ICON='  '
``` ```
@ -107,6 +108,12 @@ export BARBUK_COMMAND_DURATION=false
user@hostname in  ~/bash-it on  master ✓ ❯ user@hostname in  ~/bash-it on  master ✓ ❯
``` ```
### Python venv
```bash
  flask ~/test on  master ✓ ❯
```
### Command duration ### Command duration
```bash ```bash

7
themes/barbuk/barbuk.theme.bash
View File

@ -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:=' '}
COMMAND_DURATION_ICON=${BARBUK_COMMAND_DURATION_ICON:='  '} COMMAND_DURATION_ICON=${BARBUK_COMMAND_DURATION_ICON:='  '}
# Ssh user and hostname display # Ssh user and hostname display
@ -137,12 +138,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)$(_command_duration "$current_time")${exit_code}" PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)$(_command_duration "$current_time")${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} "