Merge branch 'vundle'

env

@@ -36,6 +36,7 @@ path=("/usr/local/bin" "/usr/bin" "/bin" "/usr/local/sbin" "/usr/sbin" "/sbin")
 prepend-to-path "/usr/X11/bin"
 prepend-to-path "/opt/local/bin"
 prepend-to-path "$HOME/.local/bin"
+prepend-to-path "$HOME/.gem/ruby/2.2.0/bin"
 prepend-to-path "$HOME/bin"
 export path
 

setup.sh

@@ -12,20 +12,22 @@ typeset -A vimbundles
 #    blackboard "https://github.com/nelstrom/vim-blackboard.git" \
 #    fugitive "https://github.com/tpope/vim-fugitive.git" \
 #    command-t           "https://github.com/wincent/Command-T.git" \
+#
+#    dash                "https://github.com/rizzatti/dash.vim.git"
+#    funcoo              "https://github.com/rizzatti/funcoo.vim.git" \
+#    gundo               "https://github.com/sjl/gundo.vim.git" \
+#    mw-utils            "https://github.com/MarcWeber/vim-addon-mw-utils.git" \
+#    repeat              "https://github.com/tpope/vim-repeat" \
+#    snipmate            "https://github.com/garbas/vim-snipmate.git" \
+#    snipmate-snippets   "https://github.com/honza/vim-snippets.git" \
+#    snipmate-zope       "https://github.com/zedr/zope-snipmate-bundle.git" \
+#    solarized           "https://github.com/altercation/vim-colors-solarized.git" \
+#    speeddating         "https://github.com/tpope/vim-speeddating.git" \
+#    surround            "https://github.com/tpope/vim-surround.git" \
+#    tlib                "https://github.com/tomtom/tlib_vim.git" \
+#    unimpaired          "https://github.com/tpope/vim-unimpaired.git" \
 vimbundles=( \
-    dash                "https://github.com/rizzatti/dash.vim.git"
-    funcoo              "https://github.com/rizzatti/funcoo.vim.git" \
-    gundo               "https://github.com/sjl/gundo.vim.git" \
-    mw-utils            "https://github.com/MarcWeber/vim-addon-mw-utils.git" \
-    repeat              "https://github.com/tpope/vim-repeat" \
-    snipmate            "https://github.com/garbas/vim-snipmate.git" \
-    snipmate-snippets   "https://github.com/honza/vim-snippets.git" \
-    snipmate-zope       "https://github.com/zedr/zope-snipmate-bundle.git" \
-    solarized           "https://github.com/altercation/vim-colors-solarized.git" \
-    speeddating         "https://github.com/tpope/vim-speeddating.git" \
-    surround            "https://github.com/tpope/vim-surround.git" \
-    tlib                "https://github.com/tomtom/tlib_vim.git" \
-    unimpaired          "https://github.com/tpope/vim-unimpaired.git" \
+    Vundle.vim          "https://github.com/gmarik/Vundle.vim.git" \
 )
 
 #if [[ ! -d ~/.oh-my-zsh ]]; then

vimrc

@@ -4,21 +4,45 @@
 " Set the location of my vim directory.
 let $VIM = $HOME."/.vim"
 
-" Load Pathogen to get all my plugins.
-try
-    call pathogen#infect()
-catch
-    call pathogen#runtime_append_all_bundles()
-endtry
-call pathogen#helptags()
+" Set this first for Vundle
+set nocompatible        " use enhanced vim features
+filetype off            " Needs to be off for Vundle to work (?)
 
+"
+" VUNDLE PLUGINS
+"
+
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'gmarik/Vundle.vim'
+
+" Editing helpers
+Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-speeddating'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-unimpaired'
+
+" Documentation and completion
+Plugin 'rizzatti/funcoo.vim'    " Required for dash
+Plugin 'rizzatti/dash.vim'
+"Plugin 'valloric/YouCompleteMe'
+
+Plugin 'sjl/gundo.vim'          " Undo helper
+Plugin 'scrooloose/nerdtree'
+
+Plugin 'erynofwales/vim-fancyfolds'
+
+" Colors~
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'tomasr/molokai'
+
+call vundle#end()
 
 "
 " CONFIG OPTIONS
 "
 
-set nocompatible        " use enhanced vim features
-
 set autoread            " reread files changed outside of vim
 set noautowrite         " don't write files before commands like :next and :make