Merging cross platform changes.

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 9421b2dda755932b5628deeb28754a9b8006de90..b212fb0fff134c574206db2bf4ed40597f97ef9b 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -44,6 +44,9 @@ Plug 'pprovost/vim-ps1'
 
 " Much better theme
 " Plug NLKNguyen/papercolor-theme
+"
+"
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 
 call plug#end()
 
@@ -65,8 +68,17 @@ set softtabstop=4 " makes the spaces feel like real tabs
 set tabstop=2
 set shiftwidth=2
 
+" Working with Go
+au BufNewFile,BufRead *.go set noet ts=2 sw=2 sts=2
+
+" Working with Markdown
+
 au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
 colorscheme slate
 " colorscheme papercolor
 set number
 
+set backupdir=c:\temp,.backup/,~/.backup/,/tmp//
+set directory=c:\temp,.swp/,~/.swp/,/tmp//
+set undodir=c:\temp,.undo/,~/.undo/,/tmp//
+set backspace=indent,eol,start " Do not be pedantic about backspace.