From 9c19e36b295ebb4e12b6d377f97b16505af50880 Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Mon, 18 Sep 2017 16:31:26 -0400
Subject: [PATCH] Added 2 new plugins since last checkin

---
 tmux/tmux.conf | 14 ++++++++++----
 vim/vimrc      |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 7737762..13b76c0 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -23,14 +23,17 @@ set -g visual-activity on
 set -g mode-keys vi
 set -g history-limit 10000
 
+set -g status-bg blue
+set -g status-fg white
+
 # y and p as in vim
 bind Escape copy-mode
 unbind p
 bind p paste-buffer
-bind -t vi-copy 'v' begin-selection
-bind -t vi-copy 'y' copy-selection
-bind -t vi-copy 'Space' halfpage-down
-bind -t vi-copy 'Bspace' halfpage-up
+#bind -t vi-copy 'v' begin-selection
+#bind -t vi-copy 'y' copy-selection
+#bind -t vi-copy 'Space' halfpage-down
+#bind -t vi-copy 'Bspace' halfpage-up
 
 # extra commands for interacting with the ICCCM clipboard
 bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
@@ -57,3 +60,6 @@ bind -r H resize-pane -L 5
 bind -r J resize-pane -D 5
 bind -r K resize-pane -U 5
 bind -r L resize-pane -R 5
+
+#set border colors
+set -g pane-active-border-fg blue
diff --git a/vim/vimrc b/vim/vimrc
index 7f47cae..2f80cd3 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -36,6 +36,9 @@ Plugin 'ryanoasis/vim-webdevicons'
 Plugin 'terryma/vim-multiple-cursors'
 Plugin 'Valloric/YouCompleteMe'
 Plugin 'brookhong/DBGPavim'
+Plugin 'tbabej/taskwiki'
+Plugin 'airblade/vim-gitgutter'
+
 filetype plugin indent on
 
 augroup vimrc_autocmds