From 10baf7b10ce07bc9ea0b0b6c13bd9a73ec711074 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 11 Jan 2016 03:23:05 -0800
Subject: [PATCH] gvim/cygwin stuff

---
 home/vimrc               | 26 +++++++++++++++++---------
 vim/colors/property2.vim |  7 +------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/home/vimrc b/home/vimrc
index ba85ec2..3e66ca6 100644
--- a/home/vimrc
+++ b/home/vimrc
@@ -13,11 +13,6 @@ endif
 
 " awful things
 if has("win32")
-    let msys='/MinGW/msys/1.0/bin'
-    let &shell=msys.'/bash.exe'
-    set shellcmdflag=-c
-    set shellxquote=\"
-    set shellslash
     " assume directory structure:
     " something/anything/.vimrc       " this was passed to vim by the -u switch
     " something/vim/
@@ -25,10 +20,20 @@ if has("win32")
     let $MYVIMRC=expand('<sfile>')
     let g:rcvim=expand('<sfile>:p:h:h').'/vim'
 
+    let msys='/MinGW/msys/1.0/bin'
+    set shellcmdflag=-c
+    set shellxquote=\"
+    set shellslash
     if !exists('win32_once')
         let win32_once=1
-        if exists('msys')
-            let $PATH.=';'.msys
+        if exists('msys')             " note: true for gvim as well
+            if isdirectory(msys)
+                let $PATH.=';'.msys
+                let &shell=msys.'/bash.exe'
+            else
+                let $PATH='/usr/local/bin;/usr/bin;/bin;'.$PATH
+                let &shell='/cygwin/bin/zsh.exe'
+            endif
         endif
         let &runtimepath=g:rcvim.','.&runtimepath.','.g:rcvim.'/after'
     endif
@@ -352,9 +357,13 @@ endtry
 
 " airline {{{1
 
+if has('gui_running')
+    " airline is broken in gvim (for me) for now
+else
 "if exists('g:airline_symbols')
     set laststatus=2
-"endif
+    let g:airline#extensions#tabline#enabled = 1
+endif
 
 let g:airline_mode_map = {
 \  'c': 'COM',
@@ -392,7 +401,6 @@ let g:airline#extensions#default#section_truncate_width = {
 \ 'z': 45,
 \ }
 
-let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#show_tab_nr = 0
 let g:airline#extensions#tabline#show_tab_type = 0
 let g:airline#extensions#tabline#fnametruncate = 20
diff --git a/vim/colors/property2.vim b/vim/colors/property2.vim
index 1b953fc..64da8ee 100644
--- a/vim/colors/property2.vim
+++ b/vim/colors/property2.vim
@@ -1,5 +1,5 @@
 " Property
-" a vim color scheme by @notwa
+" a vim color scheme by github.com/notwa
 " loosely based on Clearance by Chris Seelus (@ceelus)
 " built upon the Tomorrow scheme's functionality <http://chriskempson.com>
 
@@ -7,11 +7,6 @@
 " colorful
 " redblack
 
-" basically i split styling into:
-" built-in things you'd pass arguments to
-" built-in things you wouldn't that moreso construct the language (if, else)
-" built-in things you shouldn't use as variable names
-
 " hi \([A-Za-z]\+\) \+guifg=\([^ ]\+\) \+guibg=\([^ ]\+\) \+gui=\(\w\+\)
 
 let s:foreground        = "D6DBD5"