Browse code

Changed git_prompt_info() and the gentoo theme

Nicolas Viennot authored on 04/05/2011 at 10:47:24
Showing 2 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 # get the name of the branch we are on
2 2
 function git_prompt_info() {
3 3
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
4
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
4
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
5 5
 }
6 6
 
7 7
 # Checks if working tree is dirty
... ...
@@ -59,4 +59,4 @@ git_prompt_status() {
59 59
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
60 60
   fi
61 61
   echo $STATUS
62
-}
63 62
\ No newline at end of file
63
+}
... ...
@@ -1,4 +1,14 @@
1 1
 PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%#%{$reset_color%} '
2
+RPROMPT='%{$fg_no_bold[blue]%}[%*]%{$reset_color%}'
2 3
 
3
-ZSH_THEME_GIT_PROMPT_PREFIX="("
4
-ZSH_THEME_GIT_PROMPT_SUFFIX=") "
4
+ZSH_THEME_GIT_PROMPT_PREFIX="["
5
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[blue]%}] "
6
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●"
7
+ZSH_THEME_GIT_PROMPT_CLEAN=""
8
+ZSH_THEME_GIT_PROMPT_UNTRACKED=""
9
+
10
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}●"
11
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[red]%}●"
12
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[green]%}↪"
13
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
14
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[red]%}!!!!"