diff --git "a/\\" "b/\\" new file mode 100644 index 0000000..98c9c0f --- /dev/null +++ "b/\\" @@ -0,0 +1,34 @@ +setopt PROMPT_SUBST +export GIT_PS1_SHOWDIRTYSTATE=1 +export GIT_PS1_SHOWUPSTREAM="auto" + +function _git_info() { + if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then + + command git diff --quiet --ignore-submodules HEAD &>/dev/null; + + if [[ $? -eq 1 ]]; then + local color=yellow + else + local color=green + fi + + echo "%{%{%F{$color}}  $(__git_ps1 "%s") %{%K{$color}}" + else + echo "" + fi +} + +function zle-line-init zle-keymap-select { + VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}" + RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1" + zle reset-prompt +} +PROMPT_EC='%{%F{blue}%K{black}%} %?' +PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}' +PROMPT_DIR='%{%F{black}%} %~% ' +PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}' + +PROMPT='%{%f%b%k%}$PROMPT_EC$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU +❯ ' + diff --git "a/\\" "b/\\" new file mode 100644 index 0000000..98c9c0f --- /dev/null +++ "b/\\" @@ -0,0 +1,34 @@ +setopt PROMPT_SUBST +export GIT_PS1_SHOWDIRTYSTATE=1 +export GIT_PS1_SHOWUPSTREAM="auto" + +function _git_info() { + if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then + + command git diff --quiet --ignore-submodules HEAD &>/dev/null; + + if [[ $? -eq 1 ]]; then + local color=yellow + else + local color=green + fi + + echo "%{%{%F{$color}}  $(__git_ps1 "%s") %{%K{$color}}" + else + echo "" + fi +} + +function zle-line-init zle-keymap-select { + VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}" + RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1" + zle reset-prompt +} +PROMPT_EC='%{%F{blue}%K{black}%} %?' +PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}' +PROMPT_DIR='%{%F{black}%} %~% ' +PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}' + +PROMPT='%{%f%b%k%}$PROMPT_EC$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU +❯ ' + diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index ccfdf9e..dc442fd 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -8,14 +8,14 @@ command git diff --quiet --ignore-submodules HEAD &>/dev/null; if [[ $? -eq 1 ]]; then - local background=yellow + local color=yellow else - local background=green + local color=green fi - echo "%{%K{$background}%}%{%F{black}%}  $(__git_ps1 "%s") %{%F{$background}%K{blue}%}" + echo "%{%F{$color}%} $(__git_ps1 "%s")" else - echo "%{%K{blue}%}" + echo "" fi } @@ -24,11 +24,11 @@ RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1" zle reset-prompt } -PROMPT_EC='%{%F{blue}%K{black}%} %?' -PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}' -PROMPT_DIR='%{%F{black}%} %~% ' -PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}' +PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?' +PROMPT_USER='%{%F{magenta}%}%n ' +PROMPT_DIR='%{%F{blue}%}%~% ' +PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})' -PROMPT='%{%f%b%k%}$PROMPT_EC$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU -❯ ' +PROMPT='%{%f%b%k%} $PROMPT_EC $PROMPT_USER $PROMPT_DIR $(_git_info) +%{%f%k%b%}❯ '