From b23304d3a952a925e6667d16d25e70d53c5baf40 Mon Sep 17 00:00:00 2001
From: jon <jon@c02.nhdc.local>
Date: Sat, 9 Sep 2017 08:49:37 -0500
Subject: [PATCH 1/3] Updated bashrc

---
 bash/.bashrc                       | 2 +-
 vim/.vim/bundle/SimpylFold         | 2 +-
 vim/.vim/bundle/Vundle.vim         | 2 +-
 vim/.vim/bundle/nerdtree           | 2 +-
 vim/.vim/bundle/syntastic          | 2 +-
 vim/.vim/bundle/vim-airline        | 2 +-
 vim/.vim/bundle/vim-airline-themes | 2 +-
 vim/.vim/bundle/vim-fugitive       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index b033df7..53fd8f8 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -12,7 +12,7 @@ fi
 alias l.='ls -lh --color=auto' 2>/dev/null
 alias l='ls -lh'
 alias ll='ls -lh'
-set -o vi
+#set -o vi
 
 #golang stuff
 export GOPATH=$HOME/gopath
diff --git a/vim/.vim/bundle/SimpylFold b/vim/.vim/bundle/SimpylFold
index 9e7c1c9..aa0371d 160000
--- a/vim/.vim/bundle/SimpylFold
+++ b/vim/.vim/bundle/SimpylFold
@@ -1 +1 @@
-Subproject commit 9e7c1c9d9bd7404dc136c184fcc9680fc36a8ed9
+Subproject commit aa0371d9d708388f3ba385ccc67a7504586a20d9
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 88688fe..6437ad6 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7
+Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index eee431d..8cd17c1 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit eee431dbd44111c858c6d33ffd366cae1f17f8b3
+Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 78c0d21..5e1b26c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 78c0d21a9b0329766732ca2743a848af1c49e791
+Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index b56a064..d8eb128 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit b56a064377fcd4340e60ffd9a7fcf157f8a26939
+Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150
diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes
index 6026eb7..08c76e4 160000
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 6026eb78bf362cb3aa875aff8487f65728d0f7d8
+Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index b754bc2..913fff1 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37
+Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5

From 7ef6e0dfc733528a75698fefe75720e900bfb658 Mon Sep 17 00:00:00 2001
From: jon <jon@alto.nhdc.local>
Date: Sat, 9 Sep 2017 13:51:28 -0500
Subject: [PATCH 2/3] Conditional to set mouse correctly depending on tmux
 version

---
 tmux/.tmux.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 8e8adcc..1380bfe 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -11,7 +11,7 @@ unbind %
 
 # enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
 # copy/paste: shift+left click to highlight, then shift+middle to past
-set -g mouse on
+#set -g mouse on
 
 # stop tmux from renaming the window every time you run a command
 set-option -g allow-rename off
@@ -29,3 +29,7 @@ set -g base-index 1
 # set vi modes
 set -g status-keys vi
 set -g mode-keys vi
+
+if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+    'set -g mouse on; set -g mouse-utf8 on' \
+    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 

From a713ceaf041db5e88d3d6366109b17a2c6650a6d Mon Sep 17 00:00:00 2001
From: jon <jon@alto.nhdc.local>
Date: Sat, 9 Sep 2017 14:04:18 -0500
Subject: [PATCH 3/3] Cleaned up tmux

---
 tmux/.tmux.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1380bfe..1a1dda3 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,10 +9,6 @@ bind - split-window -v
 unbind '"'
 unbind %
 
-# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
-# copy/paste: shift+left click to highlight, then shift+middle to past
-#set -g mouse on
-
 # stop tmux from renaming the window every time you run a command
 set-option -g allow-rename off
 set-option -g pane-active-border-fg blue
@@ -30,6 +26,8 @@ set -g base-index 1
 set -g status-keys vi
 set -g mode-keys vi
 
+# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
+# copy/paste: shift+left click to highlight, then shift+middle to past
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on; set -g mouse-utf8 on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'