X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=dc45e82ec6f9a4a1a3a95fdec83f0420b82bd205;hb=b6146c546f434df2f72016f7ef5e298c3ab5ddef;hp=bdb8feb5eb902f5ad5521231f423ca2622fdfb24;hpb=e4d350e0dd95e743b01e6623c98e93466ca4b951;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index bdb8feb..dc45e82 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -33,6 +33,7 @@ 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
@@ -45,9 +46,9 @@ set backupdir=$HOME/.vim/backup//
 syntax on
 set background=dark
 colorscheme molokai
-set expandtab
-set shiftwidth=2
-set softtabstop=2
+" set expandtab
+" set shiftwidth=2
+" set softtabstop=2
 set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
@@ -69,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.
@@ -109,3 +110,6 @@ map C :VimuxPromptCommand<CR>
 
 " Quiet netrw
 let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax