diff --git a/README.md b/README.md index 15eb045..41af738 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_STATUS_SHOW`|`true`|Show/hide that segment |`BULLETTRAIN_STATUS_EXIT_SHOW`|`false`|Show/hide exit code of last command |`BULLETTRAIN_STATUS_BG`|`green`|Background color |`BULLETTRAIN_STATUS_ERROR_BG`|`red`|Background color of segment when last command exited with an error @@ -126,10 +125,9 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_TIME_SHOW`|`true`|Show/hide that segment |`BULLETTRAIN_TIME_12HR`|`false`|Format time using 12-hour clock (am/pm) -|`BULLETTRAIN_TIME_BG`|`'white'`|Background color -|`BULLETTRAIN_TIME_FG`|`'black'`|Foreground color +|`BULLETTRAIN_TIME_BG`|`white`|Background color +|`BULLETTRAIN_TIME_FG`|`black`|Foreground color ### Custom @@ -137,13 +135,12 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |--------|-------|-------| |`BULLETTRAIN_CUSTOM_MSG`|`false`|Free segment you can put a custom message which will be eval'ed for every prompt |`BULLETTRAIN_CUSTOM_BG`|`black`|Background color -|`BULLETTRAIN_CUSTOM_FG`|`black`|Foreground color +|`BULLETTRAIN_CUSTOM_FG`|`default`|Foreground color ### Context |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_CONTEXT_SHOW`|`false`|Show/hide that segment |`BULLETTRAIN_CONTEXT_BG`|`black`|Background color |`BULLETTRAIN_CONTEXT_FG`|`default`|Foreground color |`BULLETTRAIN_CONTEXT_DEFAULT_USER`|none|Default user. If you are running with other user other than default, the segment will be showed. @@ -154,7 +151,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_VIRTUALENV_SHOW`|`true`|Show/hide that segment |`BULLETTRAIN_VIRTUALENV_BG`|`yellow`|Background color |`BULLETTRAIN_VIRTUALENV_FG`|`white`|Foreground color |`BULLETTRAIN_VIRTUALENV_PREFIX`|`🐍`|Prefix of the segment @@ -163,7 +159,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_NVM_SHOW`|`false`|Show/hide that segment |`BULLETTRAIN_NVM_BG`|`green`|Background color |`BULLETTRAIN_NVM_FG`|`white`|Foreground color |`BULLETTRAIN_NVM_PREFIX`|`"⬡ "`|Prefix of the segment @@ -172,8 +167,7 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_RUBY_SHOW`|`true`|Show/hide that segment -|`BULLETTRAIN_RUBY_BG`|`red`|Background color +|`BULLETTRAIN_RUBY_BG`|`magenta`|Background color |`BULLETTRAIN_RUBY_FG`|`white`|Foreground color |`BULLETTRAIN_RUBY_PREFIX`|`"♦"`|Prefix of the segment @@ -190,7 +184,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_GO_SHOW`|`false`|Show/hide that segment |`BULLETTRAIN_GO_BG`|`green`|Background color |`BULLETTRAIN_GO_FG`|`white`|Foreground color |`BULLETTRAIN_GO_PREFIX`|`go`|Prefix of the segment @@ -199,7 +192,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_PERL_SHOW`|`false`|Show/hide that segment |`BULLETTRAIN_PERL_BG`|`yellow`|Background color |`BULLETTRAIN_PERL_FG`|`black`|Foreground color |`BULLETTRAIN_PERL_PREFIX`|`🐪`|Prefix of the segment @@ -208,7 +200,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_DIR_SHOW`|`true`|Show/hide that segment |`BULLETTRAIN_DIR_BG`|`blue`|Background color |`BULLETTRAIN_DIR_FG`|`white`|Foreground color |`BULLETTRAIN_DIR_CONTEXT_SHOW`|`false`|Show user and machine in an SCP formatted style @@ -218,7 +209,6 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_GIT_SHOW`|`true`|Show/hide that segment |`BULLETTRAIN_GIT_COLORIZE_DIRTY`|`false`|Set `BULLETTRAIN_GIT_BG` to `BULLETTRAIN_GIT_COLORIZE_DIRTY_COLOR` in dirty state |`BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR`|`yellow`|`BULLETTRAIN_GIT_BG` in dirty state |`BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR`|`black`|`BULLETTRAIN_GIT_FG` in dirty state @@ -244,13 +234,11 @@ NOTE: You do not need to specify *end* segment - it will be added automatically. |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_HG_SHOW`|`true`|Show/hide that segment ### Command execution time |Variable|Default|Meaning |--------|-------|-------| -|`BULLETTRAIN_EXEC_TIME_SHOW`|`false`|Show/hide that segment |`BULLETTRAIN_EXEC_TIME_ELAPSED`|5|Minimum elapsed time of command execution. If the execution time of a command is smaller than this, the segment will be hidden. |`BULLETTRAIN_EXEC_TIME_BG`|`yellow`|Background color |`BULLETTRAIN_EXEC_TIME_FG`|`black`|Foreground color diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme index 51fc74b..3cc8605 100644 --- a/bullet-train.zsh-theme +++ b/bullet-train.zsh-theme @@ -50,9 +50,6 @@ if [ ! -n "${BULLETTRAIN_PROMPT_ADD_NEWLINE+1}" ]; then fi # STATUS -if [ ! -n "${BULLETTRAIN_STATUS_SHOW+1}" ]; then - BULLETTRAIN_STATUS_SHOW=true -fi if [ ! -n "${BULLETTRAIN_STATUS_EXIT_SHOW+1}" ]; then BULLETTRAIN_STATUS_EXIT_SHOW=false fi @@ -67,9 +64,6 @@ if [ ! -n "${BULLETTRAIN_STATUS_FG+1}" ]; then fi # TIME -if [ ! -n "${BULLETTRAIN_TIME_SHOW+1}" ]; then - BULLETTRAIN_TIME_SHOW=true -fi if [ ! -n "${BULLETTRAIN_TIME_BG+1}" ]; then BULLETTRAIN_TIME_BG=white fi @@ -89,9 +83,6 @@ if [ ! -n "${BULLETTRAIN_CUSTOM_FG+1}" ]; then fi # VIRTUALENV -if [ ! -n "${BULLETTRAIN_VIRTUALENV_SHOW+1}" ]; then - BULLETTRAIN_VIRTUALENV_SHOW=true -fi if [ ! -n "${BULLETTRAIN_VIRTUALENV_BG+1}" ]; then BULLETTRAIN_VIRTUALENV_BG=yellow fi @@ -103,9 +94,6 @@ if [ ! -n "${BULLETTRAIN_VIRTUALENV_PREFIX+1}" ]; then fi # NVM -if [ ! -n "${BULLETTRAIN_NVM_SHOW+1}" ]; then - BULLETTRAIN_NVM_SHOW=false -fi if [ ! -n "${BULLETTRAIN_NVM_BG+1}" ]; then BULLETTRAIN_NVM_BG=green fi @@ -117,9 +105,6 @@ if [ ! -n "${BULLETTRAIN_NVM_PREFIX+1}" ]; then fi # RUBY -if [ ! -n "${BULLETTRAIN_RUBY_SHOW+1}" ]; then - BULLETTRAIN_RUBY_SHOW=true -fi if [ ! -n "${BULLETTRAIN_RUBY_BG+1}" ]; then BULLETTRAIN_RUBY_BG=red fi @@ -131,9 +116,6 @@ if [ ! -n "${BULLETTRAIN_RUBY_PREFIX+1}" ]; then fi # Go -if [ ! -n "${BULLETTRAIN_GO_SHOW+1}" ]; then - BULLETTRAIN_GO_SHOW=false -fi if [ ! -n "${BULLETTRAIN_GO_BG+1}" ]; then BULLETTRAIN_GO_BG=cyan fi @@ -159,9 +141,6 @@ if [ ! -n "${BULLETTRAIN_ELIXIR_PREFIX+1}" ]; then fi # DIR -if [ ! -n "${BULLETTRAIN_DIR_SHOW+1}" ]; then - BULLETTRAIN_DIR_SHOW=true -fi if [ ! -n "${BULLETTRAIN_DIR_BG+1}" ]; then BULLETTRAIN_DIR_BG=blue fi @@ -176,9 +155,6 @@ if [ ! -n "${BULLETTRAIN_DIR_EXTENDED+1}" ]; then fi # GIT -if [ ! -n "${BULLETTRAIN_GIT_SHOW+1}" ]; then - BULLETTRAIN_GIT_SHOW=true -fi if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY+1}" ]; then BULLETTRAIN_GIT_COLORIZE_DIRTY=false fi @@ -202,9 +178,6 @@ if [ ! -n "${BULLETTRAIN_GIT_PROMPT_CMD+1}" ]; then fi # PERL -if [ ! -n "${BULLETTRAIN_PERL_SHOW+1}" ]; then - BULLETTRAIN_PERL_SHOW=false -fi if [ ! -n "${BULLETTRAIN_PERL_BG+1}" ]; then BULLETTRAIN_PERL_BG=yellow fi @@ -215,15 +188,7 @@ if [ ! -n "${BULLETTRAIN_PERL_PREFIX+1}" ]; then BULLETTRAIN_PERL_PREFIX=🐪 fi -# HG -if [ ! -n "${BULLETTRAIN_HG_SHOW+1}" ]; then - BULLETTRAIN_HG_SHOW=true -fi - # CONTEXT -if [ ! -n "${BULLETTRAIN_CONTEXT_SHOW+1}" ]; then - BULLETTRAIN_CONTEXT_SHOW=false -fi if [ ! -n "${BULLETTRAIN_CONTEXT_BG+1}" ]; then BULLETTRAIN_CONTEXT_BG=black fi @@ -302,9 +267,6 @@ else fi # COMMAND EXECUTION TIME -if [ ! -n "${BULLETTRAIN_EXEC_TIME_SHOW+1}" ]; then - BULLETTRAIN_EXEC_TIME_SHOW=false -fi if [ ! -n "${BULLETTRAIN_EXEC_TIME_ELAPSED+1}" ]; then BULLETTRAIN_EXEC_TIME_ELAPSED=5 fi @@ -362,9 +324,8 @@ context() { local user="$(whoami)" [[ "$user" != "$BULLETTRAIN_CONTEXT_DEFAULT_USER" || -n "$BULLETTRAIN_IS_SSH_CLIENT" ]] && echo -n "${user}@$BULLETTRAIN_CONTEXT_HOSTNAME" } -prompt_context() { - [[ $BULLETTRAIN_CONTEXT_SHOW == false ]] && return +prompt_context() { local _context="$(context)" [[ -n "$_context" ]] && prompt_segment $BULLETTRAIN_CONTEXT_BG $BULLETTRAIN_CONTEXT_FG "$_context" } @@ -388,8 +349,6 @@ preexec() { } precmd() { - [[ $BULLETTRAIN_EXEC_TIME_SHOW == false ]] && return - local stop=`date +%s` local start=${cmd_timestamp:-$stop} let BULLETTRAIN_last_exec_duration=$stop-$start @@ -397,8 +356,6 @@ precmd() { } prompt_cmd_exec_time() { - [[ $BULLETTRAIN_EXEC_TIME_SHOW == false ]] && return - [ $BULLETTRAIN_last_exec_duration -gt $BULLETTRAIN_EXEC_TIME_ELAPSED ] && prompt_segment $BULLETTRAIN_EXEC_TIME_BG $BULLETTRAIN_EXEC_TIME_FG "$(displaytime $BULLETTRAIN_last_exec_duration)" } @@ -415,10 +372,6 @@ prompt_custom() { # Git prompt_git() { - if [[ $BULLETTRAIN_GIT_SHOW == false ]]; then - return - fi - local ref dirty mode repo_path git_prompt repo_path=$(git rev-parse --git-dir 2>/dev/null) @@ -439,10 +392,6 @@ prompt_git() { } prompt_hg() { - if [[ $BULLETTRAIN_HG_SHOW == false ]]; then - return - fi - local rev status if $(hg id >/dev/null 2>&1); then if $(hg prompt >/dev/null 2>&1); then @@ -479,10 +428,6 @@ prompt_hg() { # Dir: current working directory prompt_dir() { - if [[ $BULLETTRAIN_DIR_SHOW == false ]]; then - return - fi - local dir='' local _context="$(context)" [[ $BULLETTRAIN_DIR_CONTEXT_SHOW == true && -n "$_context" ]] && dir="${dir}${_context}:" @@ -506,10 +451,6 @@ prompt_dir() { # RBENV: shows current ruby version active in the shell; also with non-global gemsets if any is active # CHRUBY: shows current ruby version active in the shell prompt_ruby() { - if [[ $BULLETTRAIN_RUBY_SHOW == false ]]; then - return - fi - if command -v rvm-prompt > /dev/null 2>&1; then prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rvm-prompt i v g)" elif command -v chruby > /dev/null 2>&1; then @@ -541,10 +482,6 @@ prompt_elixir() { # PERL # PLENV: shows current PERL version active in the shell prompt_perl() { - if [[ $BULLETTRAIN_PERL_SHOW == false ]]; then - return - fi - if command -v plenv > /dev/null 2>&1; then prompt_segment $BULLETTRAIN_PERL_BG $BULLETTRAIN_PERL_FG $BULLETTRAIN_PERL_PREFIX" $(plenv version | sed -e 's/ (set.*$//')" fi @@ -552,10 +489,6 @@ prompt_perl() { # Go prompt_go() { - if [[ $BULLETTRAIN_GO_SHOW == false ]]; then - return - fi - setopt extended_glob if [[ (-f *.go(#qN) || -d Godeps || -f glide.yaml) ]]; then if command -v go > /dev/null 2>&1; then @@ -566,10 +499,6 @@ prompt_go() { # Virtualenv: current working virtualenv prompt_virtualenv() { - if [[ $BULLETTRAIN_VIRTUALENV_SHOW == false ]]; then - return - fi - local virtualenv_path="$VIRTUAL_ENV" if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX" $(basename $virtualenv_path)" @@ -580,10 +509,6 @@ prompt_virtualenv() { # NVM: Node version manager prompt_nvm() { - if [[ $BULLETTRAIN_NVM_SHOW == false ]]; then - return - fi - local nvm_prompt if type nvm >/dev/null 2>&1; then nvm_prompt=$(nvm current 2>/dev/null) @@ -596,10 +521,6 @@ prompt_nvm() { } prompt_time() { - if [[ $BULLETTRAIN_TIME_SHOW == false ]]; then - return - fi - if [[ $BULLETTRAIN_TIME_12HR == true ]]; then prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG %D{%r} else @@ -612,10 +533,6 @@ prompt_time() { # - am I root # - are there background jobs? prompt_status() { - if [[ $BULLETTRAIN_STATUS_SHOW == false ]]; then - return - fi - local symbols symbols=() [[ $RETVAL -ne 0 && $BULLETTRAIN_STATUS_EXIT_SHOW != true ]] && symbols+="✘" @@ -632,23 +549,23 @@ prompt_status() { } # Prompt Character -prompt_char() { - local bt_prompt_char - bt_prompt_char="" +prompt_chars() { + local bt_prompt_chars + bt_prompt_chars="" if [[ ${#BULLETTRAIN_PROMPT_CHAR} -eq 1 ]]; then - bt_prompt_char="${BULLETTRAIN_PROMPT_CHAR}" + bt_prompt_chars="${BULLETTRAIN_PROMPT_CHAR} " fi if [[ $BULLETTRAIN_PROMPT_ROOT == true ]]; then - bt_prompt_char="%(!.%F{red}#.%F{green}${bt_prompt_char}%f)" + bt_prompt_chars="%(!.%F{red}# .%F{green}${bt_prompt_chars}%f)" fi if [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == false ]]; then - bt_prompt_char="${bt_prompt_char}" + bt_prompt_chars="${bt_prompt_chars}" fi - echo -n $bt_prompt_char + echo -n $bt_prompt_chars } # Prompt Line Separator @@ -681,4 +598,4 @@ PROMPT="$PROMPT"'%{%f%b%k%}$(build_prompt)' [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == true ]] && PROMPT="$PROMPT$NEWLINE" PROMPT="$PROMPT"'%{${fg_bold[default]}%}' [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == false ]] && PROMPT="$PROMPT " -PROMPT="$PROMPT"'$(prompt_char) %{$reset_color%}' +PROMPT="$PROMPT"'$(prompt_chars)%{$reset_color%}'