Ignore the generated i3 configuration file

[max/dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index d01c9d80cf6d3c35cbfd63b8e486d0e626364afb..2936e3c120ca7e10a3c37870ad492363b1f514a5 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,11 +31,16 @@ 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
@@ -43,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
@@ -64,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.
@@ -101,3 +106,9 @@ set colorcolumn=80
 
 " vimux
 map C :VimuxPromptCommand<CR>
+
+" Quiet netrw
+let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax