diff options
author | James Smith <james@loopj.com> | 2011-08-01 00:44:51 -0700 |
---|---|---|
committer | James Smith <james@loopj.com> | 2011-08-01 00:44:51 -0700 |
commit | 0ba398f9e1aaf05e72406d5c840f013eebb6b260 (patch) | |
tree | 66a866657780870fcfb338606ec92b29da82eb4c /themes/fishy.zsh-theme | |
parent | a15a8c4a98bc1aff024c3ef44dec48309ff4f90b (diff) | |
parent | a738ca9b645c3cc53bdb01e8676202ceca449ccf (diff) | |
download | zsh-0ba398f9e1aaf05e72406d5c840f013eebb6b260.tar.gz zsh-0ba398f9e1aaf05e72406d5c840f013eebb6b260.tar.bz2 zsh-0ba398f9e1aaf05e72406d5c840f013eebb6b260.zip |
Merge in recent stuff
Diffstat (limited to 'themes/fishy.zsh-theme')
-rw-r--r-- | themes/fishy.zsh-theme | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme index f22eda868..f9e506cae 100644 --- a/themes/fishy.zsh-theme +++ b/themes/fishy.zsh-theme @@ -3,7 +3,18 @@ local user_color='green'; [ $UID -eq 0 ] && user_color='red' PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) ' PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)' -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" +RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" " +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?" |