Skip to content

Commit

Permalink
Merge remote branch 'robbyrussell/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dallas committed May 7, 2010
2 parents f9abe04 + 7d03691 commit 7442954
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 30 deletions.
12 changes: 4 additions & 8 deletions lib/completion.zsh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## fixme - the load process here seems a bit bizarre

setopt noautomenu
unsetopt menu_complete # do not autoselect the first completion entry
unsetopt flowcontrol
setopt auto_menu # show completion menu on succesive tab press
setopt complete_in_word
setopt always_to_end

unsetopt flowcontrol

WORDCHARS=''

autoload -U compinit
Expand All @@ -23,14 +23,10 @@ fi

zstyle ':completion:*' list-colors ''


unsetopt MENU_COMPLETE
#setopt AUTO_MENU

# should this be in keybindings?
bindkey -M menuselect '^o' accept-and-infer-next-history

zstyle ':completion:*:*:*:*:*' menu yes select
zstyle ':completion:*:*:*:*:*' menu select
# zstyle ':completion:*:*:*:*:processes' force-list always

zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
Expand Down
2 changes: 1 addition & 1 deletion lib/git.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function git_prompt_info() {
}

parse_git_dirty () {
if [[ $((git status 2> /dev/null) | tail -n1) != "nothing to commit (working directory clean)" ]]; then
if [[ -n $(git status -s 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
Expand Down
21 changes: 0 additions & 21 deletions lib/rake_completion.zsh
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
_rake_does_task_list_need_generating () {
if [ ! -f .rake_tasks~ ]; then return 0;
else
accurate=$(stat -f%m .rake_tasks~)
changed=$(stat -f%m Rakefile)
return $(expr $accurate '>=' $changed)
fi
}

_rake () {
if [ -f Rakefile ]; then
if _rake_does_task_list_need_generating; then
echo "\nGenerating .rake_tasks~..." > /dev/stderr
rake --silent --tasks | cut -d " " -f 2 > .rake_tasks~
fi
compadd `cat .rake_tasks~`
fi
}

compctl -K _rake rake

function _cap_does_task_list_need_generating () {
if [ ! -f .cap_tasks~ ]; then return 0;
else
Expand Down
20 changes: 20 additions & 0 deletions lib/spectrum.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#! /bin/zsh
# A script to make using 256 colors in zsh less painful.
# P.C. Shyamshankar <sykora@lucentbeing.com>
# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/

typeset -Ag FX FG BG

FX=(
reset "%{%}"
bold "%{%}" no-bold "%{%}"
italic "%{%}" no-italic "%{%}"
underline "%{%}" no-underline "%{%}"
blink "%{%}" no-blink "%{%}"
reverse "%{%}" no-reverse "%{%}"
)

for color in {000..255}; do
FG[$color]="%{[38;5;${color}m%}"
BG[$color]="%{[48;5;${color}m%}"
done
2 changes: 2 additions & 0 deletions oh-my-zsh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ then
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi

unset config_file
13 changes: 13 additions & 0 deletions themes/sporty_256.zsh-theme
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# zsh theme requires 256 color enabled terminal
# i.e TERM=xterm-256color
# Preview - http://www.flickr.com/photos/adelcampo/4556482563/sizes/o/
# based on robbyrussell's shell but louder!

PROMPT='%{$fg_bold[blue]%}$(git_prompt_info) %F{208}%c%f
%{$fg_bold[white]%}%# %{$reset_color%}'
RPROMPT='%B%F{208}%n%f%{$fg_bold[white]%}@%F{039}%m%f%{$reset_color%}'

ZSH_THEME_GIT_PROMPT_PREFIX="%F{154}±|%f%F{124}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}%B✘%b%F{154}|%f%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%F{154}|"

0 comments on commit 7442954

Please sign in to comment.