Fix src dir

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 51c45f405f50015434cef26878da3a79379dd741..601a6766e6b102314375b193d70abf5353cfee8e 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -21,31 +21,48 @@ set omnifunc=syntaxcomplete#Complete
 
 filetype off                  " required
 
+" =================
+" Install vim-plug if missing
+" =================
+let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
+  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+
 " =================
 " Here be Plugins!
 " =================
 call plug#begin('~/.vim/plugged')
 
 " Markdown highlighting
-Plugin 'tpope/vim-markdown'
+" Plug 'tpope/vim-markdown'
+" Plug 'plasticboy/vim-markdown'
 " let g:markdown_github_languages = ['sh', 'python']
 
 " Distraction free writing.
-Plugin 'junegunn/goyo.vim'
-nnoremap <leader>w :Goyo<Cr>
-
+Plug 'junegunn/goyo.vim'
 
 " Better status line.
-Plugin 'bling/vim-airline'
+Plug 'bling/vim-airline'
 
 " Plugin 'Windows-PowerShell-Syntax-Plugin'
 
 " PowerShell Highlighting and detection
-Plugin 'pprovost/vim-ps1'
+Plug 'pprovost/vim-ps1'
+
+" Much better theme
+" Plug NLKNguyen/papercolor-theme
+"
+"
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+
+call plug#end()
 
-call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
+nnoremap <leader>w :Goyo<Cr>
+
 " If not something else, then assume Markdown
 set filetype=markdown
 set syntax=markdown
@@ -60,4 +77,16 @@ set softtabstop=4 " makes the spaces feel like real tabs
 set tabstop=2
 set shiftwidth=2
 
-colorscheme slate
+" 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 elflord
+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.