X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=2936e3c120ca7e10a3c37870ad492363b1f514a5;hb=ffc37a4d23cb81ce719bf7b677eb730c2914659b;hp=a311a0788cd18e3a6d2267c27a7892cac9781c2d;hpb=5b7c78d98b9ce0fb01ce57cf5c632c81200e6552;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index a311a07..2936e3c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -29,21 +29,26 @@ Plugin 'ajh17/VimCompletesMe'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
-Plugin 'altercation/vim-colors-solarized'
+Plugin 'flazz/vim-colorschemes'
+Plugin 'benmills/vimux'
+Plugin 'tmhedberg/SimpylFold'
+Plugin 'saltstack/salt-vim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
 
+" Swapfiles
+set backupdir=$HOME/.vim/backup//
+
 " Random look and feel stuff
 syntax on
 set background=dark
-colorscheme solarized
+colorscheme molokai
 set expandtab
 set shiftwidth=2
 set softtabstop=2
-set number
-set t_Co=16
+set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -55,15 +60,16 @@ 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_open = 1
 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']
+let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
 let g:syntastic_cpp_compiler = 'g++'
-let g:syntastic_cpp_compiler_options = '-std=c++11'
+let g:syntastic_cpp_compiler_options = '-std=c++14'
 
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
@@ -84,6 +90,7 @@ let g:EditorConfig_exclude_patterns = ['fugitive://.*']
 
 " latex-box
 let g:LatexBox_quickfix = 4
+let g:LatexBox_viewer = "mupdf"
 
 " clang fix
 let g:clang_user_options='|| exit0'
@@ -96,3 +103,12 @@ set colorcolumn=80
 " augroup filetypedetect
 "   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
 " augroup END 
+
+" vimux
+map C :VimuxPromptCommand<CR>
+
+" Quiet netrw
+let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax