summaryrefslogtreecommitdiff
path: root/themes/minimal.zsh-theme
diff options
context:
space:
mode:
authorBrian Hartvigsen <brian.andrew@brianandjenny.com>2012-11-07 23:53:44 -0700
committerBrian Hartvigsen <brian.andrew@brianandjenny.com>2012-11-07 23:53:44 -0700
commit99468cb4ec38f11b78ac71cae0c9ac70ac0a516e (patch)
tree8c81dbf4037c3ecc163ff14e8cb81b5942302044 /themes/minimal.zsh-theme
parentc2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9 (diff)
downloadzsh-99468cb4ec38f11b78ac71cae0c9ac70ac0a516e.tar.gz
zsh-99468cb4ec38f11b78ac71cae0c9ac70ac0a516e.tar.bz2
zsh-99468cb4ec38f11b78ac71cae0c9ac70ac0a516e.zip
Update themes/minimal.zsh-theme
Cleans up minimal theme by not using a custom prompt function Removed case of 2 spaces showing if not in a version controlled folder Adds support for svn_prompt_info
Diffstat (limited to 'themes/minimal.zsh-theme')
-rw-r--r--themes/minimal.zsh-theme25
1 files changed, 14 insertions, 11 deletions
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index ee3ab6b22..a2a16031f 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -1,15 +1,18 @@
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
+ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
-git_custom_status() {
- local cb=$(current_branch)
- if [ -n "$cb" ]; then
- echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
- fi
+vcs_status() {
+ if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
+ svn_prompt_info
+ else
+ git_prompt_info
+ fi
}
-
-PROMPT='%2~ $(git_custom_status) »%b ' \ No newline at end of file
+PROMPT='%2~ $(vcs_status)»%b ' \ No newline at end of file