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

diff --git a/vim/.vimrc b/vim/.vimrc
index c346456..2936e3c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -30,11 +30,17 @@ Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
 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
@@ -42,7 +48,7 @@ colorscheme molokai
 set expandtab
 set shiftwidth=2
 set softtabstop=2
-set number
+set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -54,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.
@@ -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