X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=2936e3c120ca7e10a3c37870ad492363b1f514a5;hb=c85ac259177aaea873e1947a1b1edfab2fd4370e;hp=999ce8aa8dd3fb4cac52ed89494af35cb3bb5c63;hpb=3e7f1503e679d9fd8dc2d6cc3acc0c444a701ff8;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 999ce8a..2936e3c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -32,11 +32,15 @@ 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
@@ -44,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
@@ -65,7 +69,7 @@ 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.
@@ -102,3 +106,9 @@ set colorcolumn=80
 
 " vimux
 map C :VimuxPromptCommand<CR>
+
+" Quiet netrw
+let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax