Merge branch 'master' of github.com:sjl/oh-my-zsh

lib/aliases.zsh

@@ -9,7 +9,6 @@ alias devlog='tail -f log/development.log'
 
 # Super user
 alias _='sudo'
-alias ss='sudo su -'
 
 # Show history
 alias history='fc -l 1'

lib/completion.zsh

@@ -4,12 +4,10 @@ unsetopt noautomenu
 setopt complete_in_word
 unsetopt always_to_end
 
-unsetopt flowcontrol
-
 WORDCHARS=''
 
 autoload -U compinit
-compinit
+compinit -i
 
 zmodload -i zsh/complist
 
@@ -23,14 +21,11 @@ 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 select=1
-zstyle ':completion:*:*:*:*:processes' force-list always
+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'
 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"

lib/history.zsh

@@ -10,3 +10,6 @@ setopt hist_verify
 setopt inc_append_history
 setopt extended_history
 setopt hist_expire_dups_first
+
+setopt SHARE_HISTORY
+setopt APPEND_HISTORY

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

lib/rvm.zsh

@@ -0,0 +1,7 @@
+# get the name of the branch we are on
+function rvm_prompt_info() {
+  ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
+  echo "($ruby_version)"
+}
+
+

lib/spectrum.zsh

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