Merge branch 'master' of github.com:maxf130/dotfiles

[max/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index eff9b4905ef9c901908982afbf0cd5735b2a483b..51f96d0652a4a6138e0ea5a5f2b4e65730756337 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -11,21 +11,25 @@ call vundle#begin()
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
 Plugin 'jelera/vim-javascript-syntax' 
-Plugin 'zanloy/vim-colors-sunburst'
+Plugin 'altercation/vim-colors-solarized'
 Plugin 'Lokaltog/vim-distinguished'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
 Plugin 'Raimondi/delimitMate'
 Plugin 'scrooloose/syntastic'
-Plugin 'Valloric/YouCompleteMe'
 Plugin 'ternjs/tern_for_vim'
 Plugin 'docunext/closetag.vim'
-Plugin 'bling/vim-airline'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
+Plugin 'ajh17/VimCompletesMe'
+Plugin 'hynek/vim-python-pep8-indent'
+Plugin 'vim-scripts/octave.vim--'
+Plugin 'vim-scripts/MatlabFilesEdition'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -35,7 +39,7 @@ filetype plugin indent on    " required
 set t_Co=256
 syntax on
 set background=dark
-colorscheme sunburst 
+colorscheme solarized
 set expandtab
 set shiftwidth=2
 set softtabstop=2
@@ -52,8 +56,14 @@ set statusline+=%*
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 2
 let g:syntastic_check_on_open = 0
-let g:syntastic_check_on_wq = 0
+let g:syntastic_check_on_wq = 1
 let g:syntastic_javascript_checkers = ['eslint']
+"let g:syntastic_python_python_exec = '/usr/bin/python3'
+"let g:syntastic_python_checkers = ['flake8']
+
+" Syntastic C++11
+let g:syntastic_cpp_compiler = 'g++'
+let g:syntastic_cpp_compiler_options = '-std=c++11'
 
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
@@ -72,12 +82,17 @@ let g:ctrlp_working_path_mode = 'r'
 " Editorconfig
 let g:EditorConfig_exclude_patterns = ['fugitive://.*']
 
-" Delimit Mate
-let delimitMate_autoclose = 0
-
 " latex-box
 let g:LatexBox_quickfix = 4
-let g:LatexBox_viewer = "apvlv"
 
 " clang fix
 let g:clang_user_options='|| exit0'
+
+" Color 80th column
+highlight ColorColumn ctermbg=237
+set colorcolumn=80
+
+" Octave Syntax
+" augroup filetypedetect
+"   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
+" augroup END