Egad boom

zshrc

@@ -44,9 +44,10 @@ bindkey '^R' history-incremental-search-backward
 
 path=(
     $HOME/bin
+    $HOME/.goenv/bin
+    $HOME/gopath/bin
     $HOME/.rbenv/bin
     $HOME/.rbenv/shims
-    $HOME/src/gocode/bin
     /usr/local/sbin
     /usr/local/bin
     /usr/sbin
@@ -57,14 +58,22 @@ path=(
     /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
+#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
+
+eval "$(goenv init -)"
+export GOPATH="$HOME/gopath"
+
+CDPATH="$HOME/src:$HOME/repos"
+for prefix in github.com code.google.com/p ; do
+  CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
+done
 
 source ~/.bash_aliases