From 4b1d3c04c75f4902646af87c6cd3e0e4607d8f43 Mon Sep 17 00:00:00 2001
From: Andrew Miner <aminer@looker.com>
Date: Wed, 30 Aug 2017 14:12:20 -0700
Subject: [PATCH] Add syntastic plugin, tweak list settings, register git
 difftool

---
 home/.gitconfig | 11 ++++++++++-
 home/.vimrc     | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/home/.gitconfig b/home/.gitconfig
index 2c547d2..7267214 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -1,7 +1,16 @@
 [user]
 	name = Andrew Miner
-	email = andrewminer@mac.com
+	email = aminer@looker.com
 [pull]
     rebase = true
 [push]
 	default = simple
+[merge]
+	tool = gvimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
+[diff]
+	tool = gvimdiff
+[difftool]
+	prompt = false
diff --git a/home/.vimrc b/home/.vimrc
index 5a923bd..eda11e2 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -14,8 +14,10 @@ Plug 'leafgarland/typescript-vim'
 Plug 'nathanaelkane/vim-indent-guides'
 Plug 'plasticboy/vim-markdown'
 Plug 'scrooloose/nerdtree'
+Plug 'skammer/vim-css-color'
 Plug 'statianzo/vim-jade'
 Plug 'tpope/vim-fugitive'
+Plug 'vim-syntastic/syntastic'
 
 call plug#end()
 
@@ -39,10 +41,12 @@ set backspace=indent,eol,start
 set cmdheight=2
 set colorcolumn=120
 set cursorline
+set diffopt=filler,vertical
 set expandtab
 set nohlsearch
 set incsearch
 set laststatus=2
+set listchars=eol:⏎,tab:␉·,trail:␠,nbsp:⎵
 set modelines=2
 set nofoldenable
 set nowrap
@@ -55,7 +59,7 @@ set showbreak="+++>"
 set showcmd
 set showmatch
 set smarttab
-set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
+set statusline=%<%f\ %h%m%r%#warningmsg#%{SyntasticStatuslineFlag()}%*%=%-14.(%l,%c%V%)\ %P
 set t_Co=256
 set tabstop=4
 set textwidth=0
@@ -93,6 +97,12 @@ nmap =, :Tabularize /[^,]*:<CR>
 " nathanaelkane/vim-indent-guides
 let g:indent_guides_enable_on_vim_startup = 0 " :IndentGuidesToggle
 
+" vim-syntastic/syntastic
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
 " Key Mappings #########################################################################################################
 
 map <F1>  :NERDTreeToggle<CR>