Merge pull request #2 from nicknisi/vundle

Replacing pathogen with vundle

.gitignore

@@ -1 +1,2 @@
 .netrwhist
+vim/vim.symlink/bundle/

.gitmodules

@@ -1,96 +1,3 @@
-[submodule "vim/vim.symlink/bundle/vim-endwise"]
+[submodule "vim/vim.symlink/bundle/vundle"]
-	path = vim/vim.symlink/bundle/vim-endwise
+	path = vim/vim.symlink/bundle/vundle
-	url = https://github.com/tpope/vim-endwise.git
+	url = git@github.com:gmarik/vundle.git
-[submodule "vim/vim.symlink/bundle/vim-rake"]
-	path = vim/vim.symlink/bundle/vim-rake
-	url = https://github.com/tpope/vim-rake.git
-[submodule "vim/vim.symlink/bundle/vim-fugitive"]
-	path = vim/vim.symlink/bundle/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive.git
-[submodule "vim/vim.symlink/bundle/scss-syntax"]
-	path = vim/vim.symlink/bundle/scss-syntax
-	url = https://github.com/cakebaker/scss-syntax.vim.git
-[submodule "vim/vim.symlink/bundle/vim-ragtag"]
-	path = vim/vim.symlink/bundle/vim-ragtag
-	url = https://github.com/tpope/vim-ragtag.git
-[submodule "vim/vim.symlink/bundle/vim-jquery"]
-	path = vim/vim.symlink/bundle/vim-jquery
-	url = https://github.com/itspriddle/vim-jquery.git
-[submodule "vim/vim.symlink/bundle/vim-node"]
-	path = vim/vim.symlink/bundle/vim-node
-	url = https://github.com/mmalecki/vim-node.js.git
-[submodule "vim/vim.symlink/bundle/vim-javascript"]
-	path = vim/vim.symlink/bundle/vim-javascript
-	url = https://github.com/pangloss/vim-javascript.git
-[submodule "vim/vim.symlink/bundle/vim-markdown"]
-	path = vim/vim.symlink/bundle/vim-markdown
-	url = https://github.com/tpope/vim-markdown.git
-[submodule "vim/vim.symlink/bundle/vim-ruby"]
-	path = vim/vim.symlink/bundle/vim-ruby
-	url = https://github.com/vim-ruby/vim-ruby.git
-[submodule "vim/vim.symlink/bundle/ctrlp"]
-	path = vim/vim.symlink/bundle/ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
-[submodule "vim/vim.symlink/bundle/nerdtree"]
-	path = vim/vim.symlink/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/vim.symlink/bundle/vim-powerline"]
-	path = vim/vim.symlink/bundle/vim-powerline
-	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule "vim/vim.symlink/bundle/delimitMate"]
-	path = vim/vim.symlink/bundle/delimitMate
-	url = https://github.com/Raimondi/delimitMate.git
-[submodule "vim/vim.symlink/bundle/vim-less"]
-	path = vim/vim.symlink/bundle/vim-less
-	url = https://github.com/groenewege/vim-less.git
-[submodule "vim/vim.symlink/bundle/vitality"]
-	path = vim/vim.symlink/bundle/vitality
-	url = https://github.com/sjl/vitality.vim.git
-[submodule "vim/vim.symlink/bundle/vim-colors-solarized"]
-	path = vim/vim.symlink/bundle/vim-colors-solarized
-	url = https://github.com/altercation/vim-colors-solarized.git
-[submodule "vim/vim.symlink/bundle/vim-coffee-script"]
-	path = vim/vim.symlink/bundle/vim-coffee-script
-	url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "vim/vim.symlink/bundle/vim-rails"]
-	path = vim/vim.symlink/bundle/vim-rails
-	url = https://github.com/tpope/vim-rails.git
-[submodule "vim/vim.symlink/bundle/vim-pathogen"]
-	path = vim/vim.symlink/bundle/vim-pathogen
-	url = https://github.com/tpope/vim-pathogen.git
-[submodule "vim/vim.symlink/bundle/vim-jade"]
-	path = vim/vim.symlink/bundle/vim-jade
-	url = https://github.com/digitaltoad/vim-jade.git
-[submodule "vim/vim.symlink/bundle/vim-mustache"]
-	path = vim/vim.symlink/bundle/vim-mustache
-	url = git://github.com/juvenn/mustache.vim.git
-[submodule "vim/vim.symlink/bundle/vim-html5"]
-	path = vim/vim.symlink/bundle/vim-html5
-	url = https://github.com/othree/html5.vim.git
-[submodule "vim/vim.symlink/bundle/vim-matchit"]
-	path = vim/vim.symlink/bundle/vim-matchit
-	url = https://github.com/tsaleh/vim-matchit.git
-[submodule "vim/vim.symlink/bundle/vim-surround"]
-	path = vim/vim.symlink/bundle/vim-surround
-	url = https://github.com/tpope/vim-surround.git
-[submodule "vim/vim.symlink/bundle/vim-commentary"]
-	path = vim/vim.symlink/bundle/vim-commentary
-	url = https://github.com/tpope/vim-commentary.git
-[submodule "vim/vim.symlink/bundle/vim-ack"]
-	path = vim/vim.symlink/bundle/vim-ack
-	url = https://github.com/mileszs/ack.vim.git
-[submodule "vim/vim.symlink/bundle/ir-whack"]
-	path = vim/vim.symlink/bundle/ir-whack
-	url = git@github.com:nicknisi/ir-whack.git
-[submodule "vim/vim.symlink/bundle/scratch"]
-	path = vim/vim.symlink/bundle/scratch
-	url = git@github.com:duff/vim-scratch.git
-[submodule "vim/vim.symlink/bundle/syntastic"]
-	path = vim/vim.symlink/bundle/syntastic
-	url = git@github.com:scrooloose/syntastic.git
-[submodule "vim/vim.symlink/bundle/zencoding"]
-	path = vim/vim.symlink/bundle/zencoding
-	url = git@github.com:mattn/zencoding-vim.git
-[submodule "vim/vim.symlink/bundle/vimux"]
-	path = vim/vim.symlink/bundle/vimux
-	url = git@github.com:benmills/vimux.git

git/gitconfig.symlink

@@ -18,6 +18,8 @@
     gdc = diff --cached
     # show changed files for a commit
     cf = show --pretty="format:" --name-only
+    # undo a commit
+    undo = reset --soft
 
     # stash shortcuts
     sp = stash pop
@@ -82,3 +84,5 @@
 [core]
     excludesfile = ~/.gitignore_global
     pager = less -FXRS -x2
+[rerere]
+	enabled = true

vim/vimrc.symlink

@@ -1,10 +1,39 @@
 " vim settings
 
-" Pathogen
+filetype off
-" loads all plugins places in the ~/.vim/bundle directory
+set rtp+=~/.vim/bundle/vundle/
-runtime bundle/vim-pathogen/autoload/pathogen.vim
+call vundle#rc()
-let g:pathogen_disabled=[]
+
-call pathogen#infect()
+" 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 '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'
+Bundle 'groenewege/vim-less'
+Bundle 'nono/vim-handlebars'
+Bundle 'tsaleh/vim-matchit'
+
+filetype plugin indent on
+
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => General
@@ -40,7 +69,7 @@ set softtabstop=4
 set ttyfast
 
 " allow matching of if/end, etc. with %
-runtime macros/matchit.vim
+" runtime macros/matchit.vim
 
 " highlight conflicts
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -103,10 +132,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_bar   = "\<Esc>]50;CursorShape=1\x7"
-let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
+" let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
-let &t_SI = cursor_to_bar
+" let &t_SI = cursor_to_bar
-let &t_EI = cursor_to_block
+" let &t_EI = cursor_to_block
 
 " error bells
 set noerrorbells
@@ -163,7 +192,7 @@ set laststatus=2 " show the satus line all the time
 " Additional, plugin-specific mappings are located under
 " the plugins section
 "
-nnoremap K :q<cr>
+" nnoremap K :q<cr>
 
 " remap esc and disable to force learning
 inoremap jk <esc>