Switch back to vundle.
This commit is contained in:
parent
535629a728
commit
2d43109b5d
@ -1 +1 @@
|
|||||||
Subproject commit c3ec8796944a372c6d44496ad6113e7d2e74331e
|
Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e
|
||||||
160
.vim/vimrc
160
.vim/vimrc
@ -1,14 +1,11 @@
|
|||||||
" vim config
|
" vim config
|
||||||
" Ryan Cavicchioni
|
" Ryan Cavicchioni
|
||||||
|
|
||||||
if has('vim_starting')
|
|
||||||
set nocompatible
|
set nocompatible
|
||||||
set runtimepath+=~/.vim/bundle/neobundle.vim/
|
filetype off
|
||||||
end
|
set rtp+=~/.vim/bundle/vundle/
|
||||||
|
call vundle#rc()
|
||||||
call neobundle#rc(expand('~/.vim/bundle/'))
|
Bundle 'gmarik/vundle'
|
||||||
|
|
||||||
NeoBundleFetch 'Shougo/neobundle.vim'
|
|
||||||
|
|
||||||
if $MONO != "yes"
|
if $MONO != "yes"
|
||||||
set t_Co=256 " Set to 256 color mode.
|
set t_Co=256 " Set to 256 color mode.
|
||||||
@ -84,83 +81,84 @@ nmap <silent> <leader>u :GundoToggle<CR>
|
|||||||
filetype off
|
filetype off
|
||||||
|
|
||||||
" Plugins
|
" Plugins
|
||||||
NeoBundle 'Shougo/vimproc'
|
Bundle 'Shougo/vimproc'
|
||||||
NeoBundle 'sjl/gundo.vim.git'
|
Bundle 'sjl/gundo.vim.git'
|
||||||
NeoBundle 'scrooloose/nerdcommenter.git'
|
Bundle 'scrooloose/nerdcommenter.git'
|
||||||
NeoBundle 'scrooloose/nerdtree.git'
|
Bundle 'scrooloose/nerdtree.git'
|
||||||
NeoBundle 'msanders/snipmate.vim.git'
|
Bundle 'msanders/snipmate.vim.git'
|
||||||
NeoBundle 'godlygeek/tabular.git'
|
Bundle 'godlygeek/tabular.git'
|
||||||
NeoBundle 'tpope/vim-surround.git'
|
Bundle 'tpope/vim-surround.git'
|
||||||
NeoBundle 'mattn/gist-vim.git'
|
Bundle 'mattn/gist-vim.git'
|
||||||
NeoBundle 'tpope/vim-fugitive.git'
|
Bundle 'tpope/vim-fugitive.git'
|
||||||
NeoBundle 'python.vim'
|
Bundle 'python.vim'
|
||||||
NeoBundle 'kien/ctrlp.vim.git'
|
Bundle 'kien/ctrlp.vim.git'
|
||||||
NeoBundle 'scratch.vim'
|
Bundle 'scratch.vim'
|
||||||
NeoBundle 'bling/vim-airline'
|
Bundle 'bling/vim-airline'
|
||||||
NeoBundle 'tpope/vim-characterize'
|
Bundle 'tpope/vim-characterize'
|
||||||
|
|
||||||
" Syntax
|
" Syntax
|
||||||
NeoBundle 'groenewege/vim-less.git'
|
Bundle 'groenewege/vim-less.git'
|
||||||
NeoBundle 'tpope/vim-haml.git'
|
Bundle 'tpope/vim-haml.git'
|
||||||
NeoBundle 'jnwhiteh/vim-golang'
|
Bundle 'jnwhiteh/vim-golang'
|
||||||
NeoBundle 'slim-template/vim-slim.git'
|
Bundle 'slim-template/vim-slim.git'
|
||||||
NeoBundle 'juvenn/mustache.vim.git'
|
Bundle 'juvenn/mustache.vim.git'
|
||||||
NeoBundle 'puppetlabs/puppet-syntax-vim.git'
|
Bundle 'puppetlabs/puppet-syntax-vim.git'
|
||||||
|
|
||||||
" Themes
|
" Themes
|
||||||
NeoBundle 'jnurmine/Zenburn.git'
|
Bundle 'jnurmine/Zenburn.git'
|
||||||
NeoBundle 'ciaranm/inkpot.git'
|
Bundle 'ciaranm/inkpot.git'
|
||||||
NeoBundle 'nanotech/jellybeans.vim.git'
|
Bundle 'nanotech/jellybeans.vim.git'
|
||||||
NeoBundle 'guns/jellyx.vim.git'
|
Bundle 'guns/jellyx.vim.git'
|
||||||
NeoBundle 'strange/strange.vim.git'
|
Bundle 'strange/strange.vim.git'
|
||||||
NeoBundle 'veloce/vim-aldmeris.git'
|
Bundle 'veloce/vim-aldmeris.git'
|
||||||
NeoBundle 'altercation/vim-colors-solarized.git'
|
Bundle 'altercation/vim-colors-solarized.git'
|
||||||
NeoBundle 'Lokaltog/vim-distinguished.git'
|
Bundle 'Lokaltog/vim-distinguished.git'
|
||||||
NeoBundle 'nelstrom/vim-mac-classic-theme.git'
|
Bundle 'nelstrom/vim-mac-classic-theme.git'
|
||||||
NeoBundle 'atonse/vydark.git'
|
Bundle 'atonse/vydark.git'
|
||||||
NeoBundle 'vim-scripts/vylight.git'
|
Bundle 'vim-scripts/vylight.git'
|
||||||
NeoBundle 'tpope/vim-vividchalk.git'
|
Bundle 'tpope/vim-vividchalk.git'
|
||||||
NeoBundle 'ciaranm/inkpot.git'
|
Bundle 'ciaranm/inkpot.git'
|
||||||
NeoBundle 'jpo/vim-railscasts-theme.git'
|
Bundle 'jpo/vim-railscasts-theme.git'
|
||||||
NeoBundle 'oguzbilgic/sexy-railscasts-theme.git'
|
Bundle 'oguzbilgic/sexy-railscasts-theme.git'
|
||||||
NeoBundle 'mrkn/mrkn256.vim.git'
|
Bundle 'mrkn/mrkn256.vim.git'
|
||||||
NeoBundle 'bcat/abbott.vim.git'
|
Bundle 'bcat/abbott.vim.git'
|
||||||
NeoBundle 'twilight256.vim'
|
Bundle 'twilight256.vim'
|
||||||
NeoBundle 'vilight.vim'
|
Bundle 'vilight.vim'
|
||||||
NeoBundle 'dasch/vim-mocha.git'
|
Bundle 'dasch/vim-mocha.git'
|
||||||
NeoBundle 'dasch/satellite.git'
|
Bundle 'dasch/satellite.git'
|
||||||
NeoBundle 'djjcast/mirodark.git'
|
Bundle 'djjcast/mirodark.git'
|
||||||
NeoBundle 'molok/vim-vombato-colorscheme.git'
|
Bundle 'molok/vim-vombato-colorscheme.git'
|
||||||
NeoBundle 'jelera/vim-gummybears-colorscheme.git'
|
"Bundle 'jelera/vim-gummybears-colorscheme.git'
|
||||||
NeoBundle 'sjl/badwolf.git'
|
Bundle 'vim-scripts/Gummybears'
|
||||||
NeoBundle 'shawncplus/skittles_berry.git'
|
Bundle 'sjl/badwolf.git'
|
||||||
NeoBundle 'Skittles-Dark'
|
Bundle 'shawncplus/skittles_berry.git'
|
||||||
NeoBundle 'tortex'
|
Bundle 'Skittles-Dark'
|
||||||
NeoBundle 'mayansmoke'
|
Bundle 'tortex'
|
||||||
NeoBundle 'sjl/badwolf.git'
|
Bundle 'mayansmoke'
|
||||||
NeoBundle 'w0ng/vim-hybrid.git'
|
Bundle 'sjl/badwolf.git'
|
||||||
NeoBundle 'blackgate/tropikos-vim-theme.git'
|
Bundle 'w0ng/vim-hybrid.git'
|
||||||
NeoBundle 'zaki/zazen.git'
|
Bundle 'blackgate/tropikos-vim-theme.git'
|
||||||
NeoBundle 'jonathanfilip/vim-lucius.git'
|
Bundle 'zaki/zazen.git'
|
||||||
NeoBundle 'chriskempson/vim-tomorrow-theme.git'
|
Bundle 'jonathanfilip/vim-lucius.git'
|
||||||
NeoBundle 'tangphillip/SunburstVIM.git'
|
Bundle 'chriskempson/vim-tomorrow-theme.git'
|
||||||
NeoBundle 'nelstrom/vim-blackboard.git'
|
Bundle 'tangphillip/SunburstVIM.git'
|
||||||
NeoBundle 'tomasr/molokai.git'
|
Bundle 'nelstrom/vim-blackboard.git'
|
||||||
NeoBundle 'zeis/vim-kolor.git'
|
Bundle 'tomasr/molokai.git'
|
||||||
NeoBundle 'morhetz/gruvbox.git'
|
Bundle 'zeis/vim-kolor.git'
|
||||||
NeoBundle 'trapd00r/neverland-vim-theme.git'
|
Bundle 'morhetz/gruvbox.git'
|
||||||
NeoBundle 'chriskempson/base16-vim.git'
|
Bundle 'trapd00r/neverland-vim-theme.git'
|
||||||
NeoBundle 'changyuheng/color-scheme-holokai-of-vim.git'
|
Bundle 'chriskempson/base16-vim.git'
|
||||||
NeoBundle 'noahfrederick/Hemisu.git'
|
Bundle 'changyuheng/color-scheme-holokai-of-vim.git'
|
||||||
NeoBundle 'sk1418/last256.git'
|
Bundle 'noahfrederick/Hemisu.git'
|
||||||
NeoBundle 'toupeira/vim-desertink.git'
|
Bundle 'sk1418/last256.git'
|
||||||
NeoBundle 'junegunn/seoul256.vim.git'
|
Bundle 'toupeira/vim-desertink.git'
|
||||||
NeoBundle 'lsdr/monokai'
|
Bundle 'junegunn/seoul256.vim.git'
|
||||||
NeoBundle 'daylerees/colour-schemes', { "rtp": "vim-themes/" }
|
Bundle 'lsdr/monokai'
|
||||||
NeoBundle 'Pychimp/vim-luna'
|
Bundle 'daylerees/colour-schemes', { "rtp": "vim-themes/" }
|
||||||
NeoBundle 'Pychimp/vim-sol'
|
Bundle 'Pychimp/vim-luna'
|
||||||
NeoBundle 'vim-scripts/wombat256.vim'
|
Bundle 'Pychimp/vim-sol'
|
||||||
NeoBundle 'vim-scripts/Wombat'
|
Bundle 'vim-scripts/wombat256.vim'
|
||||||
|
Bundle 'vim-scripts/Wombat'
|
||||||
|
|
||||||
colorscheme last256
|
colorscheme last256
|
||||||
|
|
||||||
@ -174,8 +172,6 @@ let g:airline#extensions#tabline#enabled = 1
|
|||||||
let g:airline_left_sep=''
|
let g:airline_left_sep=''
|
||||||
let g:airline_right_sep=''
|
let g:airline_right_sep=''
|
||||||
|
|
||||||
NeoBundleCheck
|
|
||||||
|
|
||||||
" If it exists, include user's local vim config
|
" If it exists, include user's local vim config
|
||||||
if filereadable(expand("~/.vimrc.local"))
|
if filereadable(expand("~/.vimrc.local"))
|
||||||
source ~/.vimrc.local
|
source ~/.vimrc.local
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user