Browse code

Merge remote branch 'jreese/master'

Robby Russell authored on 07/05/2010 at 20:16:50
Showing 3 changed files
... ...
@@ -9,7 +9,7 @@ setopt always_to_end
9 9
 WORDCHARS=''
10 10
 
11 11
 autoload -U compinit
12
-compinit
12
+compinit -i
13 13
 
14 14
 zmodload -i zsh/complist
15 15
 
... ...
@@ -1,6 +1,6 @@
1 1
 # TODO: Explain what some of this does..
2 2
 autoload -U compinit
3
-compinit
3
+compinit -i
4 4
 
5 5
 bindkey -e
6 6
 bindkey '\ew' kill-region
... ...
@@ -38,4 +38,4 @@ bindkey ' ' magic-space    # also do history expansion on space
38 38
 #bindkey '^I' complete-word
39 39
 ## Fix weird sequence that rxvt produces
40 40
 #bindkey -s '^[[Z' '\t'
41
-#
42 41
\ No newline at end of file
42
+#
43 43
new file mode 100644
... ...
@@ -0,0 +1,16 @@
0
+# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
1
+
2
+if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
3
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
4
+
5
+PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
6
+$(git_prompt_info)\
7
+%{$fg[red]%}%(!.#.»)%{$reset_color%} '
8
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
9
+RPS1='${return_code}'
10
+
11
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
12
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
13
+ZSH_THEME_GIT_PROMPT_CLEAN=""
14
+ZSH_THEME_GIT_PROMPT_DIRTY="⚡"
15
+