X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=dc45e82ec6f9a4a1a3a95fdec83f0420b82bd205;hb=a37425df5dcff779ffedc660ec71e0bb0ca463a5;hp=999ce8aa8dd3fb4cac52ed89494af35cb3bb5c63;hpb=511f9cb01b77c15811cfa1c32d25432d9b89c311;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 999ce8a..dc45e82 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -32,19 +32,24 @@ Plugin 'vim-scripts/MatlabFilesEdition'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'benmills/vimux'
 Plugin 'tmhedberg/SimpylFold'
+Plugin 'saltstack/salt-vim'
+Plugin 'fatih/vim-go'
 
 " 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 molokai
-set expandtab
-set shiftwidth=2
-set softtabstop=2
-set number
+" set expandtab
+" set shiftwidth=2
+" set softtabstop=2
+set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -65,7 +70,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 +107,9 @@ set colorcolumn=80
 
 " vimux
 map C :VimuxPromptCommand<CR>
+
+" Quiet netrw
+let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax