7a9d4ceb75cbba745a6c0cecf098f6625ce50411

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

Message

Merge remote branch 'jreese/master'

Diff

 1diff --git a/lib/completion.zsh b/lib/completion.zsh
 2index 619dc0243b34ecd9c930b785bc49b30ee907961f..b627ef878590007f0fcfd83672a874fdac3a40be 100644
 3--- a/lib/completion.zsh
 4+++ b/lib/completion.zsh
 5@@ -9,7 +9,7 @@ setopt always_to_end
 6 WORDCHARS=''
 7 
 8 autoload -U compinit
 9-compinit
10+compinit -i
11 
12 zmodload -i zsh/complist
13 
14diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
15index 87e47bab6f1d040f5d77ca8504741259fd1a1496..2e282d66a85662e64e02444bdc97b0d72e7aa490 100644
16--- a/lib/key-bindings.zsh
17+++ b/lib/key-bindings.zsh
18@@ -1,6 +1,6 @@
19 # TODO: Explain what some of this does..
20 autoload -U compinit
21-compinit
22+compinit -i
23 
24 bindkey -e
25 bindkey '\ew' kill-region
26@@ -38,4 +38,4 @@ bindkey ' ' magic-space    # also do history expansion on space
27 #bindkey '^I' complete-word
28 ## Fix weird sequence that rxvt produces
29 #bindkey -s '^[[Z' '\t'
30-#
31+#
32diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme
33new file mode 100644
34index 0000000000000000000000000000000000000000..534664f115e4c8b5bcd3af8eb360362ea6de6b6b
35--- /dev/null
36+++ b/themes/jreese.zsh-theme
37@@ -0,0 +1,16 @@
38+# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
39+
40+if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
41+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
42+
43+PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
44+$(git_prompt_info)\
45+%{$fg[red]%}%(!.#.»)%{$reset_color%} '
46+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
47+RPS1='${return_code}'
48+
49+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
50+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
51+ZSH_THEME_GIT_PROMPT_CLEAN=""
52+ZSH_THEME_GIT_PROMPT_DIRTY="⚡"
53+