4dd4bf84ed1c46aaebdd51a5eaeb4f930db143da

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #226 from sunaku/fishy

Fishy theme - better Git integration

Diff

 1diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
 2index f22eda868501accc1aed45380a70d634eb8d0435..f9e506cae77d27e5782b4479c4683082bdcf0da0 100644
 3--- a/themes/fishy.zsh-theme
 4+++ b/themes/fishy.zsh-theme
 5@@ -3,7 +3,18 @@
 6 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
 7 PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
 8 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
 9-RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
10 
11-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
12-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
13+local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
14+RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
15+
16+ZSH_THEME_GIT_PROMPT_PREFIX=" "
17+ZSH_THEME_GIT_PROMPT_SUFFIX=""
18+ZSH_THEME_GIT_PROMPT_DIRTY=""
19+ZSH_THEME_GIT_PROMPT_CLEAN=""
20+
21+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
22+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
23+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
24+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
25+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
26+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"