From 59906a5fbbf6e19715b7d3ec86277c0166082809 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sun, 16 Dec 2012 21:19:24 -0600
Subject: [PATCH] Added vundle bundles

---
 .gitmodules                   |  3 +++
 vim/vim.symlink/bundle/vundle |  1 +
 vim/vimrc.symlink             | 46 ++++++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 160000 vim/vim.symlink/bundle/vundle

diff --git a/.gitmodules b/.gitmodules
index e69de29..152a3a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim/vim.symlink/bundle/vundle"]
+	path = vim/vim.symlink/bundle/vundle
+	url = git@github.com:gmarik/vundle.git
diff --git a/vim/vim.symlink/bundle/vundle b/vim/vim.symlink/bundle/vundle
new file mode 160000
index 0000000..2a494ff
--- /dev/null
+++ b/vim/vim.symlink/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 1e1bad7..295620f 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -1,10 +1,38 @@
 " vim settings
 
-" Pathogen
-" loads all plugins places in the ~/.vim/bundle directory
-runtime bundle/vim-pathogen/autoload/pathogen.vim
-let g:pathogen_disabled=[]
-call pathogen#infect()
+filetype off
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+" let vundle manage vundle
+Bundle 'gmarik/vundle'
+
+" my vim plugins
+Bundle 'kien/ctrlp.vim'
+Bundle 'scrooloose/nerdtree'
+Bundle 'mileszs/ack.vim'
+Bundle 'scrooloose/syntastic'
+Bundle 'Raimondi/delimitMate'
+Bundle 'tpope/vim-commentary'
+Bundle 'tpope/vim-endwise'
+Bundle 'tpope/vim-fugitive'
+Bundle 'othree/html5.vim'
+Bundle 'pangloss/vim-javascript'
+Bundle 'itspriddle/vim-jquery'
+Bundle 'tpope/vim-markdown'
+Bundle 'tsaleh/vim-matchit'
+Bundle 'juvenn/mustache.vim'
+Bundle 'mmalecki/vim-node.js'
+Bundle 'Lokaltog/vim-powerline'
+Bundle 'tpope/vim-ragtag'
+Bundle 'tpope/vim-surround'
+Bundle 'sjl/vitality.vim'
+Bundle 'duff/vim-scratch'
+Bundle 'cakebaker/scss-syntax.vim'
+Bundle 'kchmck/vim-coffee-script'
+
+filetype plugin indent on
+
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => General
@@ -103,10 +131,10 @@ set showmatch " show matching braces
 set mat=2 " how many tenths of a second to blink
 
 " switch to line when editing and block when not
-let cursor_to_bar   = "\<Esc>]50;CursorShape=1\x7"
-let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
-let &t_SI = cursor_to_bar
-let &t_EI = cursor_to_block
+" let cursor_to_bar   = "\<Esc>]50;CursorShape=1\x7"
+" let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
+" let &t_SI = cursor_to_bar
+" let &t_EI = cursor_to_block
 
 " error bells
 set noerrorbells