Merge remote branch 'jreese/master'

This commit is contained in:
Robby Russell 2010-05-07 13:16:50 -07:00
commit 7a9d4ceb75
3 changed files with 19 additions and 3 deletions

View File

@ -9,7 +9,7 @@ setopt always_to_end
WORDCHARS=''
autoload -U compinit
compinit
compinit -i
zmodload -i zsh/complist

View File

@ -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'
#
#

16
themes/jreese.zsh-theme Normal file
View File

@ -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="⚡"