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

init.vim

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