From 883a8b75bfe014ff3877390be14f07251fc0ff1a Mon Sep 17 00:00:00 2001 From: Jason Hollis Date: Thu, 28 Jan 2016 14:16:06 -0500 Subject: [PATCH] added ability to change FG & BG to GIT_COLORIZE_DIRTY and added color to GIT_PROMPT_DIRTY & CLEAN --- README.md | 3 ++- bullet-train.zsh-theme | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d478970..7740570 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,8 @@ or don't want to see. All options must be overridden in your **.zshrc** file. |--------|-------|-------| |`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_COLOR`|`yellow`|`BULLETTRAIN_GIT_BG` 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 |`BULLETTRAIN_GIT_BG`|`white`|Background color |`BULLETTRAIN_GIT_FG`|`black`|Foreground color |`BULLETTRAIN_GIT_PROMPT_CMD`|`git_prompt_info`|Function to display details about your git segment. diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme index 376e29d..72161bb 100644 --- a/bullet-train.zsh-theme +++ b/bullet-train.zsh-theme @@ -148,8 +148,11 @@ fi if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY+1}" ]; then BULLETTRAIN_GIT_COLORIZE_DIRTY=false fi -if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY_COLOR+1}" ]; then - BULLETTRAIN_GIT_COLORIZE_DIRTY_COLOR=yellow +if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR+1}" ]; then + BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR=black +fi +if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR+1}" ]; then + BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR=yellow fi if [ ! -n "${BULLETTRAIN_GIT_BG+1}" ]; then BULLETTRAIN_GIT_BG=white @@ -192,12 +195,12 @@ else ZSH_THEME_GIT_PROMPT_SUFFIX=$BULLETTRAIN_GIT_SUFFIX fi if [ ! -n "${BULLETTRAIN_GIT_DIRTY+1}" ]; then - ZSH_THEME_GIT_PROMPT_DIRTY=" ✘" + ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}✘%F{black}" else ZSH_THEME_GIT_PROMPT_DIRTY=$BULLETTRAIN_GIT_DIRTY fi if [ ! -n "${BULLETTRAIN_GIT_CLEAN+1}" ]; then - ZSH_THEME_GIT_PROMPT_CLEAN=" ✔" + ZSH_THEME_GIT_PROMPT_CLEAN=" %F{green}✔%F{black}" else ZSH_THEME_GIT_PROMPT_CLEAN=$BULLETTRAIN_GIT_CLEAN fi @@ -351,7 +354,8 @@ prompt_git() { if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then if [[ $BULLETTRAIN_GIT_COLORIZE_DIRTY == true && -n $(git status --porcelain --ignore-submodules) ]]; then - BULLETTRAIN_GIT_BG=$BULLETTRAIN_GIT_COLORIZE_DIRTY_COLOR + BULLETTRAIN_GIT_BG=$BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR + BULLETTRAIN_GIT_FG=$BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR fi prompt_segment $BULLETTRAIN_GIT_BG $BULLETTRAIN_GIT_FG