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

diff --git a/vim/.vimrc b/vim/.vimrc
index bdb8feb..e00de37 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -10,7 +10,7 @@ call vundle#begin()
 " alternatively, pass a path where Vundle should install plugins
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
-Plugin 'jelera/vim-javascript-syntax' 
+Plugin 'jelera/vim-javascript-syntax'
 Plugin 'noahfrederick/vim-noctu'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
@@ -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,11 +70,11 @@ 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.
-let g:airline_powerline_fonts = 0
+let g:airline_powerline_fonts = 1
 set timeoutlen=1000
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#fnamemod = ':t'
@@ -102,10 +103,16 @@ set colorcolumn=80
 " Octave Syntax
 " augroup filetypedetect
 "   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
-" augroup END 
+" augroup END
 
 " vimux
 map C :VimuxPromptCommand<CR>
 
 " Quiet netrw
 let g:netrw_silent = 1
+
+" Set folding
+set foldmethod=syntax
+
+" Better saving behaviour for go
+let g:go_fmt_experimental = 1