Improve plugin situation

1 files changed, 17 insertions, 10 deletions

diff --git a/shell/_vimrc b/shell/_vimrc
index ba04334..c3eb5c3 100644
--- a/shell/_vimrc
+++ b/shell/_vimrc
@@ -7,8 +7,12 @@
 let mapleader="," " set leader early as otherwise it wouldn't work
 
 " ----- NeoBundle -----
+" Note: Skip initialization for vim-tiny or vim-small.
+if 0 | endif
+
+let first_run=0
 if !filereadable(expand('~/.vim/bundle/neobundle.vim/README.md'))
-	" if vundle isn't currently installed
+	let first_run=1
 	silent !git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
 endif
 
@@ -17,15 +21,13 @@ if has('vim_starting')
 		set nocompatible " Be iMproved
 	endif
 
-	set runtimepath+=/home/xramses/.vim/bundle/neobundle.vim/
+	set runtimepath+=~/.vim/bundle/neobundle.vim/
 endif
 
-call neobundle#begin(expand('/home/xramses/.vim/bundle'))
+call neobundle#begin(expand('~/.vim/bundle/'))
 
-" Let NeoBundle manage NeoBundle
 NeoBundleFetch 'Shougo/neobundle.vim'
 
-" Add or remove your Bundles here:
 NeoBundle 'Shougo/vimproc.vim', {
 \ 'build' : {
 \     'windows' : 'tools\\update-dll-mingw',
@@ -43,21 +45,26 @@ NeoBundle 'bling/vim-airline'
 NeoBundle 'scrooloose/syntastic'
 NeoBundle 'scrooloose/nerdcommenter'
 NeoBundle 'tpope/vim-surround'
-"NeoBundle 'msanders/snipmate.vim'
 NeoBundle 'davidhalter/jedi-vim'
 NeoBundle 'wting/rust.vim'
 NeoBundle 'ledger/vim-ledger'
+NeoBundle 'junegunn/vim-easy-align'
+"NeoBundle 'msanders/snipmate.vim'
 "NeoBundle 'godlygeek/tabular'
 "NeoBundle 'plasticboy/vim-markdown'
-NeoBundle 'junegunn/vim-easy-align'
+
+" Disable plugins for very large files
+NeoBundleLazy 'vim-scripts/LargeFile'
 
 call neobundle#end()
 
 filetype plugin indent on
 
-" If there are uninstalled bundles found on startup,
-" this will conveniently prompt you to install them.
-NeoBundleCheck
+if first_run
+	NeoBundleInstall
+else
+	NeoBundleCheck
+endif
 
 " ----- general settings -----
 set encoding=utf-8