diff --git a/zshrc b/zshrc
index 480edbc..91f3865 100644
--- a/zshrc
+++ b/zshrc
@@ -1,13 +1,80 @@
-HISTFILE=~/.zsh-histfile
-HISTSIZE=10000
-SAVEHIST=100000
-setopt appendhistory extendedglob nomatch
-unsetopt autocd beep notify
-bindkey -v
-autoload -Uz compinit
-compinit
-
-export PS1="\$ "
-function precmd() {
-    echo "$USER@$HOST:$(truncpwd)"
+ZSH=$HOME/.oh-my-zsh
+ZSH_THEME=robbyrussell
+
+CASE_SENSITIVE="true"
+
+# Comment this out to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how often before auto-updates occur? (in days)
+export UPDATE_ZSH_DAYS=3
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want to disable command autocorrection
+DISABLE_CORRECTION="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting
+# for completion
+COMPLETION_WAITING_DOTS="true"
+
+# Uncomment following line if you want to disable marking untracked files under
+# VCS as dirty. This makes repository status check for large repositories much,
+# much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+plugins=(
+    gitfast
+    ruby
+    vi-mode
+    autoenv
+    bundler
+    golang
+    rbenv
+)
+
+source $ZSH/oh-my-zsh.sh
+
+unsetopt correct_all
+
+path=(
+    $HOME/bin
+    $HOME/.rbenv/bin
+    $HOME/.rbenv/shims
+    $HOME/src/gocode/bin
+    /usr/local/sbin
+    /usr/local/bin
+    /usr/sbin
+    /usr/bin
+    /sbin
+    /bin
+    /usr/games
+    /usr/local/games
+)
+
+if [ -f ~/.gvm/scripts/gvm ] ; then
+    source ~/.gvm/scripts/gvm
+    gvm use go1.2
+    if [ -f ~/src/gocode/src/.env ] ; then
+        unset _GOCODE_DID_SETUP
+        source ~/src/gocode/src/.env
+    fi
+fi
+
+source ~/.bash_aliases
+
+function dump-ssh-agent() {
+    env | awk '/SSH/ {
+        sub(/=/, "=\"", $1)
+        sub(/$/, "\"", $1)
+        print "export " $1
+    }' | tee ~/.ssh/agent.out
+}
+
+function load-ssh-agent() {
+    source ~/.ssh/agent.out
 }