Merge branch 'master' of gogs.tforgione.fr:tforgione/dotfiles

This commit is contained in:
Thomas FORGIONE 2016-08-31 10:02:59 +02:00
commit 399e400ceb
1 changed files with 6 additions and 6 deletions

View File

@ -49,11 +49,11 @@ if has('vim_starting')
endif endif
" Required: " Required:
call neobundle#begin(expand('/home/thomas/.nvim/bundle')) " call neobundle#begin(expand('/home/thomas/.nvim/bundle'))
" Let NeoBundle manage NeoBundle " Let NeoBundle manage NeoBundle
" Required: " Required:
NeoBundleFetch 'Shougo/neobundle.vim' " NeoBundleFetch 'Shougo/neobundle.vim'
" NeoBundle 'Shougo/vimproc.vim', { " NeoBundle 'Shougo/vimproc.vim', {
" \ 'build' : { " \ 'build' : {
@ -67,14 +67,14 @@ NeoBundleFetch 'Shougo/neobundle.vim'
" NeoBundle 'Quramy/tsuquyomi' " NeoBundle 'Quramy/tsuquyomi'
" Required: " Required:
call neobundle#end() " call neobundle#end()
" Required: " Required:
filetype plugin indent on " filetype plugin indent on
" If there are uninstalled bundles found on startup, " If there are uninstalled bundles found on startup,
" this will conveniently prompt you to install them. " this will conveniently prompt you to install them.
NeoBundleCheck " NeoBundleCheck
"End NeoBundle Scripts------------------------- "End NeoBundle Scripts-------------------------
" Vundle " Vundle
@ -92,7 +92,7 @@ NeoBundleCheck
" COLOR #############################################################{{{ " COLOR #############################################################{{{
set background=dark " use dark background set background=dark " use dark background
syntax enable " enable syntax processing syntax enable " enable syntax processing
colorscheme mypeachpuff " awesome colorscheme colorscheme peachpuff " awesome colorscheme
" }}} " }}}
" INDENTATION #######################################################{{{ " INDENTATION #######################################################{{{