diff options
| author | Robby Russell <robby@planetargon.com> | 2010-05-07 13:16:50 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2010-05-07 13:16:50 -0700 |
| commit | 7a9d4ceb75cbba745a6c0cecf098f6625ce50411 (patch) | |
| tree | 2c1c7ce35806a0d3a3f573bdddca10d6a97c4f4b | |
| parent | 44cad95ed220a3a3a0c76de15186f395fc6e7ab0 (diff) | |
| parent | 99d72cad5573f7481c28a75228b940f2212c9e1b (diff) | |
| download | zsh-7a9d4ceb75cbba745a6c0cecf098f6625ce50411.tar.gz zsh-7a9d4ceb75cbba745a6c0cecf098f6625ce50411.tar.bz2 zsh-7a9d4ceb75cbba745a6c0cecf098f6625ce50411.zip | |
Merge remote branch 'jreese/master'
| -rw-r--r-- | lib/completion.zsh | 2 | ||||
| -rw-r--r-- | lib/key-bindings.zsh | 4 | ||||
| -rw-r--r-- | themes/jreese.zsh-theme | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index 619dc0243..b627ef878 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -9,7 +9,7 @@ setopt always_to_end WORDCHARS='' autoload -U compinit -compinit +compinit -i zmodload -i zsh/complist diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 87e47bab6..2e282d66a 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -1,6 +1,6 @@ # TODO: Explain what some of this does.. autoload -U compinit -compinit +compinit -i bindkey -e bindkey '\ew' kill-region @@ -38,4 +38,4 @@ bindkey ' ' magic-space # also do history expansion on space #bindkey '^I' complete-word ## Fix weird sequence that rxvt produces #bindkey -s '^[[Z' '\t' -#
\ No newline at end of file +# diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme new file mode 100644 index 000000000..534664f11 --- /dev/null +++ b/themes/jreese.zsh-theme @@ -0,0 +1,16 @@ +# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png + +if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \ +$(git_prompt_info)\ +%{$fg[red]%}%(!.#.»)%{$reset_color%} ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='${return_code}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="⚡" + |