Permalink
Browse files

Switched from Pathogen to Vundle.

  • Loading branch information...
1 parent 7960a41 commit 75c45c63391b653eb931776769da1e8f2cf0d0d1 @jdiamond committed Dec 14, 2011
View
1 .gitignore
@@ -1 +1,2 @@
+bundle
.netrwhist
View
57 .gitmodules
@@ -1,54 +1,3 @@
-[submodule "bundles/argtextobj.vim"]
- path = bundles/argtextobj.vim
- url = https://github.com/vim-scripts/argtextobj.vim.git
-[submodule "bundles/camelcasemotion"]
- path = bundles/camelcasemotion
- url = https://github.com/vim-scripts/camelcasemotion.git
- ignore = untracked
-[submodule "bundles/DetectIndent"]
- path = bundles/DetectIndent
- url = https://github.com/vim-scripts/DetectIndent.git
- ignore = untracked
-[submodule "bundles/vim-blackboard"]
- path = bundles/vim-blackboard
- url = https://github.com/nelstrom/vim-blackboard.git
-[submodule "bundles/vim-surround"]
- path = bundles/vim-surround
- url = https://github.com/tpope/vim-surround.git
- ignore = untracked
-[submodule "bundles/vim-unimpaired"]
- path = bundles/vim-unimpaired
- url = https://github.com/tpope/vim-unimpaired.git
- ignore = untracked
-[submodule "bundles/delimitMate"]
- path = bundles/delimitMate
- url = https://github.com/Raimondi/delimitMate.git
-[submodule "bundles/nerdtree"]
- path = bundles/nerdtree
- url = https://github.com/scrooloose/nerdtree.git
-[submodule "bundles/matchit"]
- path = bundles/matchit
- url = https://github.com/vim-scripts/matchit.zip.git
- ignore = untracked
-[submodule "bundles/supertab"]
- path = bundles/supertab
- url = https://github.com/ervandew/supertab.git
-[submodule "bundles/snipmate"]
- path = bundles/snipmate
- url = https://github.com/msanders/snipmate.vim.git
- ignore = untracked
-[submodule "bundles/vim-makegreen"]
- path = bundles/vim-makegreen
- url = https://github.com/reinh/vim-makegreen.git
-[submodule "bundles/tcomment_vim"]
- path = bundles/tcomment_vim
- url = https://github.com/tomtom/tcomment_vim.git
-[submodule "bundles/vim-colors-solarized"]
- path = bundles/vim-colors-solarized
- url = https://github.com/altercation/vim-colors-solarized.git
-[submodule "bundles/open-browser.vim"]
- path = bundles/open-browser.vim
- url = https://github.com/tyru/open-browser.vim.git
-[submodule "bundles/vim-fugitive"]
- path = bundles/vim-fugitive
- url = https://github.com/tpope/vim-fugitive.git
+[submodule "vundle"]
+ path = vundle
+ url = https://github.com/gmarik/vundle.git
1 bundles/DetectIndent
@@ -1 +0,0 @@
-Subproject commit befd4126b9a98c58a254ad7ccc05a053442aad67
1 bundles/argtextobj.vim
@@ -1 +0,0 @@
-Subproject commit f3fbe427f7b4ec436416a5816d714dc917dc530b
1 bundles/camelcasemotion
@@ -1 +0,0 @@
-Subproject commit e810454eb3d60f8f461cf7e1b8f9ab0337148d3e
1 bundles/delimitMate
@@ -1 +0,0 @@
-Subproject commit d0fc1456b7ff424311be65bb17e697dcb87ebe18
1 bundles/matchit
@@ -1 +0,0 @@
-Subproject commit ced6c409c9beeb0b4142d21906606bd194411d1d
1 bundles/nerdtree
@@ -1 +0,0 @@
-Subproject commit 7650cdc6621cd15b047dc04605b8b0bc0396564d
1 bundles/open-browser.vim
@@ -1 +0,0 @@
-Subproject commit f3616ab8aa4e4caf54ee23fa390e4e4ac787bfb4
1 bundles/snipmate
@@ -1 +0,0 @@
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
1 bundles/supertab
@@ -1 +0,0 @@
-Subproject commit 5edeb681fd780be3477c0ebea75716625b7b6582
1 bundles/tcomment_vim
@@ -1 +0,0 @@
-Subproject commit 12bb928024f3a78226135808695f59ca8c78f737
1 bundles/vim-blackboard
@@ -1 +0,0 @@
-Subproject commit c216b4355d4ece0b0868d621c60dd221e7751b0f
1 bundles/vim-colors-solarized
@@ -1 +0,0 @@
-Subproject commit bc35c899ec8ef23d481a95028b93ec50b04bd16c
1 bundles/vim-fugitive
@@ -1 +0,0 @@
-Subproject commit 5e25040a97580845348ea5f853085088c4840ba9
1 bundles/vim-makegreen
@@ -1 +0,0 @@
-Subproject commit c778231becd7e795e3272fcc464e0c945891841f
1 bundles/vim-surround
@@ -1 +0,0 @@
-Subproject commit 27710a2224d6dd0486d1c40d09ef18dd752e7d37
1 bundles/vim-unimpaired
@@ -1 +0,0 @@
-Subproject commit 9b898d31988640f2bbc07fc35f588bd1247ffa33
View
4 gvimrc
@@ -1,6 +1,8 @@
" Set the font.
set guifont=Consolas:h12:cANSI
+set background=dark
+
" Set the colorscheme.
-colorscheme blackboard
+silent! colorscheme solarized
View
72 vimrc
@@ -7,13 +7,20 @@ set nocompatible
set runtimepath^=~/.vim
set runtimepath+=~/.vim/after
-" Pathogen docs suggest turning filetype off at first.
+" Vundle docs require turning filetype off at first.
filetype off
-" Append the bundle directories to the runtimepath.
-call pathogen#runtime_append_all_bundles('bundles')
+" Turn on Vundle.
+set rtp+=~/.vim/vundle/
+call vundle#rc()
-" Enable filetype detection. Must be after Pathogen call.
+" Bundles go here.
+Bundle 'DetectIndent'
+Bundle 'altercation/vim-colors-solarized'
+Bundle 'kien/ctrlp.vim'
+Bundle 'kchmck/vim-coffee-script'
+
+" Enable filetype detection. Must be after bundlers get added.
filetype plugin indent on
" Hitting the , key is more convenient than \ key.
@@ -121,9 +128,6 @@ set textwidth=79 " Wrap lines at column 79.
set nojoinspaces " Don't add two spaces at the end of sentences.
set colorcolumn=81 " Show a line at column 81.
-" Shortcut for opening NERDTree.
-noremap <silent><Leader>f :NERDTreeToggle<CR>
-
" Set tabstop, softtabstop and shiftwidth to the same value {{{
" From http://vimcasts.org/episodes/tabs-and-spaces/
command! -nargs=* Stab call Stab()
@@ -188,59 +192,6 @@ endfunction
" }}}
-" Bubbling text {{{
-
-" http://vimcasts.org/episodes/bubbling-text/
-" Uses vim-unimpaired: http://github.com/tpope/vim-unimpaired
-
-" Bubble single lines.
-nmap <C-Up> [e
-nmap <C-Down> ]e
-
-" Bubble multiple lines.
-vmap <C-Up> [egv
-vmap <C-Down> ]egv
-" }}}
-
-" View in browser {{{
-
-" Tell the openbrowser plugin to *not* open files in Vim.
-let g:openbrowser_open_filepath_in_vim = 0
-
-nnoremap <leader>v :call ViewFileInBrowser()<CR>
-nnoremap <leader>V :call SetFileToViewInBrowser()<CR>
-
-function! ViewFileInBrowser()
- if exists('g:filetoview')
- call OpenFileInBrowser(g:filetoview)
- else
- call SetFileToViewInBrowser()
- endif
-endfunction
-
-function! SetFileToViewInBrowser()
- if &buftype == 'nofile' || &buftype == 'quickfix' || &buftype == 'help'
- return
- endif
- let l:choice = confirm('Set "' . expand('%') . '" as the default file to view from now on?', "&Yes, set this file as the default and view it\n&No, just view this file")
- if l:choice == 0
- return
- endif
- if l:choice == 1
- let g:filetoview = expand('%:p')
- endif
- call OpenFileInBrowser(expand('%p'))
-endfunction
-
-function! OpenFileInBrowser(file)
- if &modified
- write
- endif
- call openbrowser#open(a:file)
-endfunction
-
-" }}}
-
let g:snippets_dir = '~/.vim/snippets'
" FileType Auto Commands {{{
@@ -272,3 +223,4 @@ augroup AllAutoCommands
augroup END
" }}}
+
1 vundle
@@ -0,0 +1 @@
+Subproject commit 37e82d1e181ea7943d20061d63dd132184f9f602

0 comments on commit 75c45c6

Please sign in to comment.