X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=cbdb9ce51dd58ff66b183b6a1e100d75b1b08ffa;hb=2e914ea5e3e0523ea825b50904d5dfc3a9af419b;hp=f314c734835aa68e1cec97ad4a5d6678752ffacf;hpb=8715288ef82193391f7d5a6b0fc24f61af09b22b;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index f314c73..cbdb9ce 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"
@@ -73,7 +74,7 @@ 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'
@@ -109,3 +110,9 @@ 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