From e141d0b1f808d5582dcf01191dc99e6eaeed58ad Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 9 Sep 2017 09:00:13 -0500
Subject: [PATCH 01/28] Removed a comment from Xresources

---
 x/.Xresources | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/x/.Xresources b/x/.Xresources
index 907ffb6..e9777e0 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,9 +1,6 @@
 *background: #151B1A
 *foreground: #8FA388
 
-! Alternate foreground
-! !*foreground: #7E9982
-
 *cursorColor: #9E6438
 
 *color0: #2E2B38

From 9d59533e47551ca83b753a0d6077d852de92e86b Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sun, 24 Sep 2017 17:54:32 -0500
Subject: [PATCH 02/28] Mapped C-Tab to function like alt-tab

---
 tmux/.tmux.conf              | 5 ++++-
 vim/.vim/.netrwhist          | 5 +++++
 vim/.vim/bundle/vim-airline  | 2 +-
 vim/.vim/bundle/vim-surround | 1 +
 vim/.vimrc                   | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 vim/.vim/.netrwhist
 create mode 160000 vim/.vim/bundle/vim-surround

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1a1dda3..55f475b 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -29,5 +29,8 @@ 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 mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+
+bind-key Tab last-window
+bind-key BTab previous-window
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
new file mode 100644
index 0000000..66efdea
--- /dev/null
+++ b/vim/.vim/.netrwhist
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/home/jon'
+let g:netrw_dirhist_2='/home/jon/.gnome'
+let g:netrw_dirhist_3='/home/jon'
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index d8eb128..e9a7a12 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150
+Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137
diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround
new file mode 160000
index 0000000..e49d6c2
--- /dev/null
+++ b/vim/.vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313
diff --git a/vim/.vimrc b/vim/.vimrc
index e8faabf..c4269a7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -78,6 +78,7 @@ Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
+Plugin 'tpope/vim-surround'
 
 call vundle#end()            " required
 filetype plugin indent on    " required

From 4b6766a2157095a1efe3683f3515615c5cbca009 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Thu, 2 Nov 2017 19:02:21 -0500
Subject: [PATCH 03/28] Added nested tmux config

---
 tmux/.tmux.conf | 31 +++++++++++++++++++++++++++++++
 x/.Xresources   |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 55f475b..c85c4d2 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -34,3 +34,34 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
 
 bind-key Tab last-window
 bind-key BTab previous-window
+
+#nested tmux
+set -g status-bg colour40
+setw -g window-status-current-bg colour40
+
+bind -n C-t new-window -a
+bind -n S-left  prev
+bind -n S-right next
+bind -n S-C-left  swap-window -t -1
+bind -n S-C-right swap-window -t +1
+
+bind -n M-F11 set -qg status-bg colour25
+bind -n M-F12 set -qg status-bg colour40
+bind -n S-up \
+	send-keys M-F12 \; \
+	set -qg status-bg colour25 \; \
+	unbind -n S-left \; \
+	unbind -n S-right \; \
+	unbind -n S-C-left \; \
+	unbind -n S-C-right \; \
+	unbind -n C-t \; \
+	set -qg prefix C-b
+bind -n S-down \
+	send-keys M-F11 \; \
+	set -qg status-bg colour40 \; \
+	bind -n S-left  prev \; \
+	bind -n S-right next \; \
+	bind -n S-C-left swap-window -t -1 \; \
+	bind -n S-C-right swap-window -t +1 \; \
+	bind -n C-t new-window -a -c "#{pane_current_path}" \; \
+	set -qg prefix C-a
diff --git a/x/.Xresources b/x/.Xresources
index e9777e0..7b1bf93 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -27,4 +27,6 @@ URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
-URxvt*url-launcher:      /usr/bin/google-chrome
+! URxvt*url-launcher:      /usr/bin/google-chrome
+URxvt*url-launcher:     /home/jon/Downloads/firefox/firefox 
+

From 8ec84cb04cb2073f5741bc1073e53dfa4a088a50 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Thu, 2 Nov 2017 19:05:10 -0500
Subject: [PATCH 04/28] Removed nested for now

---
 tmux/.tmux.conf | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c85c4d2..e89d7bc 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -35,33 +35,3 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
 bind-key Tab last-window
 bind-key BTab previous-window
 
-#nested tmux
-set -g status-bg colour40
-setw -g window-status-current-bg colour40
-
-bind -n C-t new-window -a
-bind -n S-left  prev
-bind -n S-right next
-bind -n S-C-left  swap-window -t -1
-bind -n S-C-right swap-window -t +1
-
-bind -n M-F11 set -qg status-bg colour25
-bind -n M-F12 set -qg status-bg colour40
-bind -n S-up \
-	send-keys M-F12 \; \
-	set -qg status-bg colour25 \; \
-	unbind -n S-left \; \
-	unbind -n S-right \; \
-	unbind -n S-C-left \; \
-	unbind -n S-C-right \; \
-	unbind -n C-t \; \
-	set -qg prefix C-b
-bind -n S-down \
-	send-keys M-F11 \; \
-	set -qg status-bg colour40 \; \
-	bind -n S-left  prev \; \
-	bind -n S-right next \; \
-	bind -n S-C-left swap-window -t -1 \; \
-	bind -n S-C-right swap-window -t +1 \; \
-	bind -n C-t new-window -a -c "#{pane_current_path}" \; \
-	set -qg prefix C-a

From 73be33c5556d046046652534a12e649b08bedcfb Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:16:42 -0600
Subject: [PATCH 05/28] Updated tmux mouse option

---
 tmux/.tmux.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1a1dda3..aadfd0c 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -29,5 +29,6 @@ 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 mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+#    'set -g mouse on; set -g mouse-utf8 on' \

From 2bca7516f95a05971c3b761e43193e5d7cbc1578 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:21:42 -0600
Subject: [PATCH 06/28] Cleaned up cruft from merge

---
 tmux/.tmux.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c8152f1..9cf6ff1 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -31,11 +31,8 @@ set -g mode-keys vi
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-<<<<<<< HEAD
 #    'set -g mouse on; set -g mouse-utf8 on' \
-=======
 
 bind-key Tab last-window
 bind-key BTab previous-window
 
->>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50

From 5080ea55a5ccaed74e3c0213796ebfc8384582da Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:23:08 -0600
Subject: [PATCH 07/28] Deleted the crap from the mergetool

---
 tmux/.tmux_BACKUP_4958.conf | 41 -------------------------------------
 tmux/.tmux_BASE_4958.conf   | 33 -----------------------------
 tmux/.tmux_LOCAL_4958.conf  | 34 ------------------------------
 tmux/.tmux_REMOTE_4958.conf | 37 ---------------------------------
 4 files changed, 145 deletions(-)
 delete mode 100644 tmux/.tmux_BACKUP_4958.conf
 delete mode 100644 tmux/.tmux_BASE_4958.conf
 delete mode 100644 tmux/.tmux_LOCAL_4958.conf
 delete mode 100644 tmux/.tmux_REMOTE_4958.conf

diff --git a/tmux/.tmux_BACKUP_4958.conf b/tmux/.tmux_BACKUP_4958.conf
deleted file mode 100644
index c8152f1..0000000
--- a/tmux/.tmux_BACKUP_4958.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# 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
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-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 mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-<<<<<<< HEAD
-#    'set -g mouse on; set -g mouse-utf8 on' \
-=======
-
-bind-key Tab last-window
-bind-key BTab previous-window
-
->>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50
diff --git a/tmux/.tmux_BASE_4958.conf b/tmux/.tmux_BASE_4958.conf
deleted file mode 100644
index 1a1dda3..0000000
--- a/tmux/.tmux_BASE_4958.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# 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
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-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' 
diff --git a/tmux/.tmux_LOCAL_4958.conf b/tmux/.tmux_LOCAL_4958.conf
deleted file mode 100644
index aadfd0c..0000000
--- a/tmux/.tmux_LOCAL_4958.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# 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
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-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 mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-#    'set -g mouse on; set -g mouse-utf8 on' \
diff --git a/tmux/.tmux_REMOTE_4958.conf b/tmux/.tmux_REMOTE_4958.conf
deleted file mode 100644
index e89d7bc..0000000
--- a/tmux/.tmux_REMOTE_4958.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# 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
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-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 mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-
-bind-key Tab last-window
-bind-key BTab previous-window
-

From 66eb427a0d4b98f7bb5d4a82c52ee2cf796e6d5a Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 16 Dec 2017 13:04:54 -0600
Subject: [PATCH 08/28] vim relative line numbers and some other stuff

---
 bash/.bashrc  |  2 ++
 vim/.vimrc    |  3 ++
 x/.Xresources |  2 +-
 xorg.conf     | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 xorg.conf

diff --git a/bash/.bashrc b/bash/.bashrc
index 53fd8f8..8f63c90 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -19,3 +19,5 @@ export GOPATH=$HOME/gopath
 export PATH=$GOPATH:$GOPATH/bin:$PATH
 
 export EDITOR=/usr/bin/vim
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/vim/.vimrc b/vim/.vimrc
index c4269a7..6ca0e6e 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -22,6 +22,9 @@ set fileformat=unix
 hi cursorline cterm=none term=none ctermbg=236
 set cursorline
 
+"enable relative line numbers
+set number relativenumber
+
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
 
diff --git a/x/.Xresources b/x/.Xresources
index 7b1bf93..da76c80 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -28,5 +28,5 @@ URxvt*shading: 10
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
-URxvt*url-launcher:     /home/jon/Downloads/firefox/firefox 
+URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
 
diff --git a/xorg.conf b/xorg.conf
new file mode 100644
index 0000000..a2bcb3c
--- /dev/null
+++ b/xorg.conf
@@ -0,0 +1,76 @@
+# nvidia-settings: X configuration file generated by nvidia-settings
+# nvidia-settings:  version 384.59  (mockbuild@)  Wed Jul 26 13:26:18 CEST 2017
+
+
+Section "ServerLayout"
+    Identifier     "Layout0"
+    Screen      0  "Screen0" 0 0
+    InputDevice    "Keyboard0" "CoreKeyboard"
+    InputDevice    "Mouse0" "CorePointer"
+    Option         "Xinerama" "0"
+EndSection
+
+Section "Files"
+    FontPath        "/usr/share/fonts/default/Type1"
+EndSection
+
+Section "Module"
+    Load           "dbe"
+    Load           "extmod"
+    Load           "type1"
+    Load           "freetype"
+    Load           "glx"
+EndSection
+
+Section "InputDevice"
+
+    # generated from default
+    Identifier     "Mouse0"
+    Driver         "mouse"
+    Option         "Protocol" "auto"
+    Option         "Device" "/dev/input/mice"
+    Option         "Emulate3Buttons" "no"
+    Option         "ZAxisMapping" "4 5"
+EndSection
+
+Section "InputDevice"
+
+    # generated from default
+    Identifier     "Keyboard0"
+    Driver         "keyboard"
+EndSection
+
+Section "Monitor"
+
+    # HorizSync source: edid, VertRefresh source: edid
+    Identifier     "Monitor0"
+    VendorName     "Unknown"
+    ModelName      "DELL U2415"
+    HorizSync       30.0 - 83.0
+    VertRefresh     49.0 - 61.0
+    Option         "DPMS"
+EndSection
+
+Section "Device"
+    Identifier     "Device0"
+    Driver         "nvidia"
+    VendorName     "NVIDIA Corporation"
+    BoardName      "GeForce GTX 1070"
+EndSection
+
+Section "Screen"
+    Identifier     "Screen0"
+    Device         "Device0"
+    Monitor        "Monitor0"
+    DefaultDepth    24
+    Option         "Stereo" "0"
+    Option         "nvidiaXineramaInfoOrder" "DFP-6"
+    Option         "metamodes" "DP-4: nvidia-auto-select +1920+0, DP-0: nvidia-auto-select +0+0, DP-2: nvidia-auto-select +3840+0"
+    Option         "SLI" "Off"
+    Option         "MultiGPU" "Off"
+    Option         "BaseMosaic" "off"
+    SubSection     "Display"
+        Depth       24
+    EndSubSection
+EndSection
+

From 118990f58eeb83ea97e846db00a914550679fa29 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 23 Dec 2017 10:14:40 -0600
Subject: [PATCH 09/28] Switched from airline to lightline and modified vimrc
 to hide showmode

---
 vim/.vim/bundle/lightline.vim | 1 +
 vim/.vimrc                    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 160000 vim/.vim/bundle/lightline.vim

diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
new file mode 160000
index 0000000..b19faca
--- /dev/null
+++ b/vim/.vim/bundle/lightline.vim
@@ -0,0 +1 @@
+Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
diff --git a/vim/.vimrc b/vim/.vimrc
index 6ca0e6e..30e1501 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,6 +8,8 @@ set nu
 set laststatus=2
 set hidden
 set incsearch
+" hide showmode because its in statusline
+set noshowmode
 
 " Indent settings - this is for PEP8 compatibility
 set expandtab
@@ -76,8 +78,9 @@ Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
+"Plugin 'vim-airline/vim-airline'
+"Plugin 'vim-airline/vim-airline-themes'
+Plugin 'itchyny/lightline.vim'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'

From 06a46e5ff74c0f549dc1770baaea1567048221d0 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 23 Dec 2017 10:32:26 -0600
Subject: [PATCH 10/28] Added some comments and jk to leave insert because I
 keep trying to use it

---
 vim/.vimrc | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index 30e1501..26d1235 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,10 +8,11 @@ set nu
 set laststatus=2
 set hidden
 set incsearch
+
 " hide showmode because its in statusline
 set noshowmode
 
-" Indent settings - this is for PEP8 compatibility
+" Indent settings - PEP8 compatibility
 set expandtab
 set autoindent
 set tabstop=4
@@ -30,7 +31,10 @@ set number relativenumber
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
 
+"highlight matching brace when closing brace, flash for 2 tenths
 set showmatch
+set matchtime=2
+
 let pythong_highlight_all = 1
 syntax on
 
@@ -48,6 +52,7 @@ nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 " use jj to escape insert mode 
 inoremap jj <Esc>
+inoremap jk <Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -56,19 +61,17 @@ nnoremap <S-Tab> :bprev<CR>
 nnoremap <leader>p :CtrlPBuffer<CR>
 nnoremap <space> za
 
-
-" NERDTree
+" NERDTree, open/close toggle
 map <C-n> :NERDTreeToggle<CR>
 
-"airline - show buffers in the tabline if theres only one tab (always)
-let g:airline#extensions#tabline#enabled = 1
+"lightline colorscheme
+let g:lightline = {'colorscheme': 'powerline',}
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 " " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
-"
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
@@ -78,8 +81,6 @@ Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
-"Plugin 'vim-airline/vim-airline'
-"Plugin 'vim-airline/vim-airline-themes'
 Plugin 'itchyny/lightline.vim'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
@@ -88,25 +89,3 @@ Plugin 'tpope/vim-surround'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
-
-" "
-" " Brief help
-" " :PluginList       - lists configured plugins
-" " :PluginInstall    - installs plugins; append `!` to update or just
-" :PluginUpdate
-" " :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" " :PluginClean      - confirms removal of unused plugins; append `!` to
-" auto-approve removal
-" "
-" " see :h vundle for more details or wiki for FAQ
-" " Put your non-Plugin stuff after this line
-
-"python with virtualenv support
-"py << EOF
-"import os
-"import sys
-"if 'VIRTUAL_ENV' in os.environ:
-"    project_base_dir = os.environ['VIRTUAL_ENV']
-"    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
-"    execfile(activate_this, dict(__file__=activate_this))
-"EOF

From 6898dd3545bb2cebd350513d5689e25d14b81289 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 23 Dec 2017 10:54:26 -0600
Subject: [PATCH 11/28] Added kj as additional mapping so i can just mash it

---
 vim/.vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vim/.vimrc b/vim/.vimrc
index 26d1235..e44b663 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -53,6 +53,7 @@ nnoremap <C-h> <C-W><C-H>
 " use jj to escape insert mode 
 inoremap jj <Esc>
 inoremap jk <Esc>
+inoremap kj <Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>

From f8110f9e99f2746e47e2c3027c3a14bb250633af Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 28 Apr 2018 09:57:25 -0500
Subject: [PATCH 12/28] Made a bunch of changes to shit whoops

---
 bash/.bashrc                     |  1 +
 conky/.config/conky/conky.conf   |  2 +-
 vim/.vim/bundle/goyo.vim         |  1 +
 vim/.vim/bundle/lightline-buffer |  1 +
 vim/.vim/bundle/minibufexpl.vim  |  1 +
 vim/.vimrc                       | 35 +++++++++++++++++++++++++++++++-
 x/.Xresources                    |  1 +
 7 files changed, 40 insertions(+), 2 deletions(-)
 create mode 160000 vim/.vim/bundle/goyo.vim
 create mode 160000 vim/.vim/bundle/lightline-buffer
 create mode 160000 vim/.vim/bundle/minibufexpl.vim

diff --git a/bash/.bashrc b/bash/.bashrc
index 8f63c90..cfd6be4 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -13,6 +13,7 @@ alias l.='ls -lh --color=auto' 2>/dev/null
 alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
+alias p='ping'
 
 #golang stuff
 export GOPATH=$HOME/gopath
diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf
index 6e8ae9a..3a5b248 100644
--- a/conky/.config/conky/conky.conf
+++ b/conky/.config/conky/conky.conf
@@ -57,5 +57,5 @@ conky.config = {
 }
 
 conky.text = [[
-L $loadavg | M $mem | $battery_short | N ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M}
+$loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M} | $battery_short 
 ]]
diff --git a/vim/.vim/bundle/goyo.vim b/vim/.vim/bundle/goyo.vim
new file mode 160000
index 0000000..5b8bd03
--- /dev/null
+++ b/vim/.vim/bundle/goyo.vim
@@ -0,0 +1 @@
+Subproject commit 5b8bd0378758c1d9550d8429bef24b3d6d78b592
diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer
new file mode 160000
index 0000000..1c090e0
--- /dev/null
+++ b/vim/.vim/bundle/lightline-buffer
@@ -0,0 +1 @@
+Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca
diff --git a/vim/.vim/bundle/minibufexpl.vim b/vim/.vim/bundle/minibufexpl.vim
new file mode 160000
index 0000000..ad72976
--- /dev/null
+++ b/vim/.vim/bundle/minibufexpl.vim
@@ -0,0 +1 @@
+Subproject commit ad72976ca3df4585d49aa296799f14f3b34cf953
diff --git a/vim/.vimrc b/vim/.vimrc
index e44b663..3b3bf55 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,6 +6,7 @@ set encoding=utf-8
 let mapleader=","
 set nu
 set laststatus=2
+set showtabline=2
 set hidden
 set incsearch
 
@@ -54,6 +55,9 @@ nnoremap <C-h> <C-W><C-H>
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
+" blank lines
+nnoremap <Enter> o<ESC>
+nnoremap <S-Enter> O<ESC>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -76,17 +80,46 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
+"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
-"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 Plugin 'itchyny/lightline.vim'
+Plugin 'taohex/lightline-buffer'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'junegunn/goyo.vim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
+
+" use lightline-buffer in lightline
+let g:lightline = {
+    \ 'tabline': {
+    \   'left': [ [ 'bufferinfo' ],
+    \             [ 'separator' ],
+    \             [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
+    \   'right': [ [ 'close' ], ],
+    \ },
+    \ 'component_expand': {
+    \   'buffercurrent': 'lightline#buffer#buffercurrent',
+    \   'bufferbefore': 'lightline#buffer#bufferbefore',
+    \   'bufferafter': 'lightline#buffer#bufferafter',
+    \ },
+    \ 'component_type': {
+    \   'buffercurrent': 'tabsel',
+    \   'bufferbefore': 'raw',
+    \   'bufferafter': 'raw',
+    \ },
+    \ 'component_function': {
+    \   'bufferinfo': 'lightline#buffer#bufferinfo',
+    \ },
+    \ 'component': {
+    \   'separator': '',
+    \ },
+    \ }
+
diff --git a/x/.Xresources b/x/.Xresources
index da76c80..2043cc1 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -30,3 +30,4 @@ URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
 URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
 
+! URxvt.blurRadius: 25

From bd4ca982b15b6a875136117cec04d9840dcfac0b Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 5 May 2018 08:02:30 -0500
Subject: [PATCH 13/28] Added easyescape for faster jk/kj escaping

---
 vim/.vim/bundle/vim-easyescape |  1 +
 vim/.vimrc                     | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 160000 vim/.vim/bundle/vim-easyescape

diff --git a/vim/.vim/bundle/vim-easyescape b/vim/.vim/bundle/vim-easyescape
new file mode 160000
index 0000000..710f59b
--- /dev/null
+++ b/vim/.vim/bundle/vim-easyescape
@@ -0,0 +1 @@
+Subproject commit 710f59bc13acd843aa80b2a2954fea6154f730c5
diff --git a/vim/.vimrc b/vim/.vimrc
index 3b3bf55..4745d72 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -51,10 +51,12 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
-" use jj to escape insert mode 
-inoremap jj <Esc>
-inoremap jk <Esc>
-inoremap kj <Esc>
+" use jk to escape insert mode - using easyescape plugin 
+let g:easyescape_chars = { "j": 1, "k": 1 }
+let g:easyescape_timeout = 100
+cnoremap jk <ESC>
+cnoremap kj <ESC>
+
 " blank lines
 nnoremap <Enter> o<ESC>
 nnoremap <S-Enter> O<ESC>
@@ -93,6 +95,7 @@ Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
 Plugin 'junegunn/goyo.vim'
+Plugin 'zhou13/vim-easyescape'
 
 call vundle#end()            " required
 filetype plugin indent on    " required

From 3c959a0fb8ec41b1ac2a49e7a7063256ad945a47 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sun, 20 May 2018 08:57:21 -0500
Subject: [PATCH 14/28] Big change here was tmux status bar and messing with X
 colors

---
 bash/.bashrc                     |  3 ++
 tmux/.tmux.conf                  | 33 ++++++++++++++++
 vim/.vim/bundle/Vundle.vim       |  2 +-
 vim/.vim/bundle/calendar.vim     |  2 +-
 vim/.vim/bundle/jedi-vim         |  2 +-
 vim/.vim/bundle/lightline-buffer |  2 +-
 vim/.vim/bundle/lightline.vim    |  2 +-
 vim/.vim/bundle/nerdtree         |  2 +-
 vim/.vim/bundle/syntastic        |  2 +-
 vim/.vim/bundle/vim-fugitive     |  2 +-
 x/.Xresources                    | 67 ++++++++++++++++++++------------
 11 files changed, 87 insertions(+), 32 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index cfd6be4..6dbc515 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -14,6 +14,7 @@ alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
 alias p='ping'
+alias s='sudo'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -22,3 +23,5 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+xrdb -merge /home/jon/.colors/codeschool.dark
+
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9cf6ff1..ec1c43d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -36,3 +36,36 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
 bind-key Tab last-window
 bind-key BTab previous-window
 
+set -g default-terminal "screen-256color"
+
+# Basic status bar colors
+set-option -g status-bg default
+set-option -g status-fg white
+
+# Left side of status bar
+set-option -g status-left-length 40
+set-option -g status-left "#[fg=colour18,bg=colour12] #S #[fg=default,bg=default] "
+
+# Window status
+set-option -g window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W "
+set-option -g window-status-current-format "#[fg=colour18,bg=colour7] #I #[fg=colour18,bg=colour4] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 40
+set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
+
+# Pane border
+set-option -g pane-border-bg default
+set-option -g pane-border-fg brightblack
+set-option -g pane-active-border-bg default
+set-option -g pane-active-border-fg white
+
+# Pane number indicator
+set-option -g display-panes-colour brightblack
+set-option -g display-panes-active-colour brightwhite
+
+# Clock mode
+set-option -g clock-mode-colour white
+set-option -g clock-mode-style 24
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..f07ff6a 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65
diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer
index 1c090e0..128ddaa 160000
--- a/vim/.vim/bundle/lightline-buffer
+++ b/vim/.vim/bundle/lightline-buffer
@@ -1 +1 @@
-Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca
+Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..41fb97e 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..6188c5e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..d17b98c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..b14434b 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2
diff --git a/x/.Xresources b/x/.Xresources
index 2043cc1..13e9429 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,33 +1,52 @@
-*background: #151B1A
-*foreground: #8FA388
-
-*cursorColor: #9E6438
-
-*color0: #2E2B38
-*color1: #984E66
-*color2: #7A8C54
-*color3: #9E6438
-*color4: #395667
-*color5: #9D916B
-*color6: #536556
-*color7: #828181
-*color8: #474159
-*color9: #A86D56
-*color10: #9FB274
-*color11: #B29F5E
-*color12: #507A91
-*color13: #B89855
-*color14: #7E9982
-*color15: #BDBDA4
 URxvt*scrollBar:	false
-URxvt.font:     xft:xos4 Terminus:size=14:antialias=true
-URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true
+URxvt.font:     xft:Terminus:size=14:antialias=true
+!URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
 URxvt*transparent: true
 URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
-URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+! URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+URxvt*url-launcher:     /usr/bin/firefox
 
 ! URxvt.blurRadius: 25
+URxvt*.termName: rxvt-unicode-256color
+
+! special
+*.foreground:   #c5c8c6
+*.background:   #1d1f21
+*.cursorColor:  #c5c8c6
+
+! black
+*.color0:       #282a2e
+*.color8:       #373b41
+
+! red
+*.color1:       #a54242
+*.color9:       #cc6666
+
+! green
+*.color2:       #8c9440
+*.color10:      #b5bd68
+
+! yellow
+*.color3:       #de935f
+*.color11:      #f0c674
+
+! blue
+*.color4:       #5f819d
+*.color12:      #81a2be
+
+! magenta
+*.color5:       #85678f
+*.color13:      #b294bb
+
+! cyan
+*.color6:       #5e8d87
+*.color14:      #8abeb7
+
+! white
+*.color7:       #707880
+*.color15:      #c5c8c6
+

From 8339691402a347f81d8e7896e8acfc8cebca7ddf Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sun, 20 May 2018 10:08:10 -0500
Subject: [PATCH 15/28] Removed xrdb from bashrc

---
 bash/.bashrc                  | 1 -
 vim/.vim/bundle/jedi-vim      | 2 +-
 vim/.vim/bundle/lightline.vim | 2 +-
 vim/.vim/bundle/nerdtree      | 2 +-
 vim/.vim/bundle/syntastic     | 2 +-
 vim/.vim/bundle/vim-fugitive  | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 6dbc515..2f28a73 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -23,5 +23,4 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-xrdb -merge /home/jon/.colors/codeschool.dark
 
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index f07ff6a..48af2af 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65
+Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index 41fb97e..78c43c1 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
+Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 6188c5e..a172d7c 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
+Subproject commit a172d7cfcb4fe9b927dcc24184204fc89d826301
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index d17b98c..b7b473b 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
+Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index b14434b..3e0bd86 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2
+Subproject commit 3e0bd86b99c50691f830d9e25a4bbe2a88078f8f

From daa517a02f3c54c234a687215b177ae95b06dfa3 Mon Sep 17 00:00:00 2001
From: jomido <jomido@nhdc.local>
Date: Wed, 2 May 2018 09:48:10 -0500
Subject: [PATCH 16/28] Main thing here was adding enter mapping in vim to
 insert newline without leaving normal mode

---
 tmux/.tmux.conf                | 9 ++++++++-
 vim/.vim/.netrwhist            | 4 +++-
 vim/.vim/bundle/Vundle.vim     | 2 +-
 vim/.vim/bundle/calendar.vim   | 2 +-
 vim/.vim/bundle/jedi-vim       | 2 +-
 vim/.vim/bundle/lightline.vim  | 2 +-
 vim/.vim/bundle/nerdtree       | 2 +-
 vim/.vim/bundle/syntastic      | 2 +-
 vim/.vim/bundle/targets.vim    | 1 +
 vim/.vim/bundle/vim-buftabline | 1 +
 vim/.vim/bundle/vim-fugitive   | 2 +-
 vim/.vimrc                     | 5 ++++-
 12 files changed, 24 insertions(+), 10 deletions(-)
 create mode 160000 vim/.vim/bundle/targets.vim
 create mode 160000 vim/.vim/bundle/vim-buftabline

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9cf6ff1..980e37e 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,3 +1,8 @@
+#remove escape delay
+set -s escape-time 0
+
+set -g default-terminal "rxvt-unicode-256color"
+
 #change C-b to Ca
 unbind C-b
 set-option -g prefix C-a
@@ -31,7 +36,9 @@ set -g mode-keys vi
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-#    'set -g mouse on; set -g mouse-utf8 on' \
+
+set -g mouse on
+#'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
 bind-key BTab previous-window
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
index 66efdea..5d389e8 100644
--- a/vim/.vim/.netrwhist
+++ b/vim/.vim/.netrwhist
@@ -1,5 +1,7 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =5
 let g:netrw_dirhist_1='/home/jon'
 let g:netrw_dirhist_2='/home/jon/.gnome'
 let g:netrw_dirhist_3='/home/jon'
+let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
+let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..48af2af 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..78c43c1 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..a0e49c9 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..2c02edd 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c
diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim
new file mode 160000
index 0000000..c173218
--- /dev/null
+++ b/vim/.vim/bundle/targets.vim
@@ -0,0 +1 @@
+Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4
diff --git a/vim/.vim/bundle/vim-buftabline b/vim/.vim/bundle/vim-buftabline
new file mode 160000
index 0000000..14d208b
--- /dev/null
+++ b/vim/.vim/bundle/vim-buftabline
@@ -0,0 +1 @@
+Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..409b098 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add
diff --git a/vim/.vimrc b/vim/.vimrc
index e44b663..92b2598 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -54,6 +54,7 @@ nnoremap <C-h> <C-W><C-H>
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
+nnoremap <CR> o<Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -66,7 +67,7 @@ nnoremap <space> za
 map <C-n> :NERDTreeToggle<CR>
 
 "lightline colorscheme
-let g:lightline = {'colorscheme': 'powerline',}
+let g:lightline = {'colorscheme': 'jellybeans',}
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -87,6 +88,8 @@ Plugin 'itchyny/lightline.vim'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'ap/vim-buftabline'
+Plugin 'wellle/targets.vim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required

From 7526102530177cfecd3418c457a975e5465cca0f Mon Sep 17 00:00:00 2001
From: jomido <jomido@nhdc.local>
Date: Wed, 23 May 2018 09:34:23 -0500
Subject: [PATCH 17/28] Added vi mode back into bashrc and fixed cls bug

---
 bash/.bashrc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bash/.bashrc b/bash/.bashrc
index 8f63c90..e273039 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -21,3 +21,11 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
+#vi readline
+set -o vi
+#ctrl-x, ctrl-e to launch $EDITOR (vim)
+bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
+
+#fix clear screen in vi mode
+bind -m vi-insert "\C-l":clear-screen

From 26bf46ad54973c05fad18a7dda15ac89f63a762f Mon Sep 17 00:00:00 2001
From: jomido <jomido@nhdc.local>
Date: Wed, 23 May 2018 10:21:47 -0500
Subject: [PATCH 18/28] Fixed merge issues

---
 bash/.bashrc | 3 ---
 vim/.vimrc   | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 01d5fc1..357dde3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,6 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
-<<<<<<< HEAD
 #vi readline
 set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
@@ -32,5 +31,3 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
-=======
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
diff --git a/vim/.vimrc b/vim/.vimrc
index 19ba076..a148695 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -51,13 +51,13 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
-<<<<<<< HEAD
+
 " use jj to escape insert mode 
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
 nnoremap <CR> o<Esc>
-=======
+
 " use jk to escape insert mode - using easyescape plugin 
 let g:easyescape_chars = { "j": 1, "k": 1 }
 let g:easyescape_timeout = 100
@@ -67,7 +67,6 @@ cnoremap kj <ESC>
 " blank lines
 nnoremap <Enter> o<ESC>
 nnoremap <S-Enter> O<ESC>
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -90,7 +89,6 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
-"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
@@ -102,13 +100,10 @@ Plugin 'taohex/lightline-buffer'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
-<<<<<<< HEAD
 Plugin 'ap/vim-buftabline'
 Plugin 'wellle/targets.vim'
-=======
 Plugin 'junegunn/goyo.vim'
 Plugin 'zhou13/vim-easyescape'
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 call vundle#end()            " required
 filetype plugin indent on    " required

From 20434b8de10b16e645908a4c6a979b0408fca1b4 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 2 Jun 2018 07:33:17 -0500
Subject: [PATCH 19/28] Updated default pager settings

---
 bash/.bashrc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 6dbc515..e620385 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -6,7 +6,15 @@ if [ -f /etc/bashrc ]; then
 fi
 
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
+#export SYSTEMD_PAGER=
+
+#pager setup
+#-C faster reprints
+#-M more status
+#-I case insensitive
+#-j 5 show X lines above search for context
+## 4 - right/left four chars
+export LESS='-C -M -I -j 5 -# 4'
 
 # User specific aliases and functions
 alias l.='ls -lh --color=auto' 2>/dev/null
@@ -15,6 +23,7 @@ alias ll='ls -lh'
 #set -o vi
 alias p='ping'
 alias s='sudo'
+alias ip='ip -c'
 
 #golang stuff
 export GOPATH=$HOME/gopath

From 36ce64ada64d0d9adc019885f6013b8b016e46e3 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 2 Jun 2018 07:33:56 -0500
Subject: [PATCH 20/28] Vim plugin updates

---
 vim/.vim/bundle/jedi-vim      | 2 +-
 vim/.vim/bundle/lightline.vim | 2 +-
 vim/.vim/bundle/nerdtree      | 2 +-
 vim/.vim/bundle/syntastic     | 2 +-
 vim/.vim/bundle/vim-fugitive  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 48af2af..f07ff6a 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
+Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index 78c43c1..41fb97e 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
+Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index a0e49c9..6188c5e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8
+Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 2c02edd..d17b98c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c
+Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 409b098..b14434b 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add
+Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2

From 7389708dcd23df87da827f816e25e9bf5e1cf3fc Mon Sep 17 00:00:00 2001
From: jomido <jomido@nhdc.local>
Date: Wed, 20 Jun 2018 11:50:59 -0500
Subject: [PATCH 21/28] Updated bashrc, dmesg -T and l/ll/etc colors

---
 bash/.bashrc | 8 +++-----
 vim/.vimrc   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 357dde3..3fb33b5 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -10,11 +10,11 @@ fi
 
 # User specific aliases and functions
 alias l.='ls -lh --color=auto' 2>/dev/null
-alias l='ls -lh'
-alias ll='ls -lh'
-#set -o vi
+alias l='ls -lh --color=auto'
+alias ll='ls -lh --color=auto'
 alias p='ping'
 alias s='sudo'
+alias dmesg='dmesg -H'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -24,8 +24,6 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
-#vi readline
-set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
 bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
diff --git a/vim/.vimrc b/vim/.vimrc
index a148695..a8e7047 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -27,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
 set cursorline
 
 "enable relative line numbers
-set number relativenumber
+"set number relativenumber
 
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>

From 164ab9f4d81bd4ac43c2e7e9253c06d0b55d8224 Mon Sep 17 00:00:00 2001
From: Jon Dossey <jdossey@apr038.sacnrm.local>
Date: Thu, 21 Jun 2018 12:30:32 -0500
Subject: [PATCH 22/28] Created tools dir for simple scripts

---
 .tools/get_public_ip.sh            | 3 +++
 tmux/.tmux.conf                    | 8 +++-----
 vim/.vim/bundle/Vundle.vim         | 2 +-
 vim/.vim/bundle/calendar.vim       | 2 +-
 vim/.vim/bundle/jedi-vim           | 2 +-
 vim/.vim/bundle/lightline.vim      | 2 +-
 vim/.vim/bundle/nerdtree           | 2 +-
 vim/.vim/bundle/syntastic          | 2 +-
 vim/.vim/bundle/targets.vim        | 2 +-
 vim/.vim/bundle/vim-airline        | 2 +-
 vim/.vim/bundle/vim-airline-themes | 2 +-
 vim/.vim/bundle/vim-fugitive       | 2 +-
 vim/.vimrc                         | 2 +-
 13 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100755 .tools/get_public_ip.sh

diff --git a/.tools/get_public_ip.sh b/.tools/get_public_ip.sh
new file mode 100755
index 0000000..4d3ba92
--- /dev/null
+++ b/.tools/get_public_ip.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dig +short myip.opendns.com @resolver1.opendns.com;
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 940568d..e905e7f 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,8 +1,8 @@
+set -g default-terminal screen-256color
+
 #remove escape delay
 set -s escape-time 0
 
-set -g default-terminal "rxvt-unicode-256color"
-
 #change C-b to Ca
 unbind C-b
 set-option -g prefix C-a
@@ -37,14 +37,12 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
 
-set -g mouse on
+#set -g mouse on
 #'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
 bind-key BTab previous-window
 
-set -g default-terminal "screen-256color"
-
 # Basic status bar colors
 set-option -g status-bg default
 set-option -g status-fg white
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 9a38216..6437ad6 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
+Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 1aee272..6d6be26 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
+Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 48af2af..7792439 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
+Subproject commit 77924398bd594e238766153cec97ace62650f082
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index 78c43c1..555f202 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
+Subproject commit 555f202e33987863aaa31bf4df75ef989c3c49a7
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index a0e49c9..97433ed 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8
+Subproject commit 97433edd43f3a4a95c84389bcaafbe7a047cf756
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 2c02edd..206b616 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c
+Subproject commit 206b616c8e49f948d18231799c469aa3e6e2c29c
diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim
index c173218..c3042dc 160000
--- a/vim/.vim/bundle/targets.vim
+++ b/vim/.vim/bundle/targets.vim
@@ -1 +1 @@
-Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4
+Subproject commit c3042dc18acc0dfcee479310d3efc6aefe92db75
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index e9a7a12..396cc92 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137
+Subproject commit 396cc9226171f8dbf1069800a0ae56700bbf3913
diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes
index 08c76e4..26f67b9 160000
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339
+Subproject commit 26f67b926553555e505ac60e992c97ab5fdfc83f
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 409b098..7c9b87a 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add
+Subproject commit 7c9b87a3c3ef4b53425aca4a27e11a7359caae9f
diff --git a/vim/.vimrc b/vim/.vimrc
index a8e7047..b3a0059 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -60,7 +60,7 @@ nnoremap <CR> o<Esc>
 
 " use jk to escape insert mode - using easyescape plugin 
 let g:easyescape_chars = { "j": 1, "k": 1 }
-let g:easyescape_timeout = 100
+"let g:easyescape_timeout = 100
 cnoremap jk <ESC>
 cnoremap kj <ESC>
 

From e6fbc77181622cbe35553c6210d88ea1e99b34a0 Mon Sep 17 00:00:00 2001
From: Jon Dossey <jdossey@atl080.deltahealthgroup.com>
Date: Thu, 21 Jun 2018 17:16:04 -0500
Subject: [PATCH 23/28] Updated some stuff (great msg right?)

---
 dirindex.html                    | 33 +++++++++++++++++++++++++
 index.html                       |  1 +
 vim/.vim/bundle/Vundle.vim       |  2 +-
 vim/.vim/bundle/calendar.vim     |  2 +-
 vim/.vim/bundle/dirindex.html    | 41 ++++++++++++++++++++++++++++++++
 vim/.vim/bundle/index.html       |  1 +
 vim/.vim/bundle/jedi-vim         |  2 +-
 vim/.vim/bundle/lightline-buffer |  2 +-
 vim/.vim/bundle/lightline.vim    |  2 +-
 vim/.vim/bundle/nerdtree         |  2 +-
 vim/.vim/bundle/syntastic        |  2 +-
 vim/.vim/bundle/vim-fugitive     |  2 +-
 vim/.vim/dirindex.html           | 37 ++++++++++++++++++++++++++++
 vim/.vim/index.html              |  1 +
 vim/.vimrc                       |  2 +-
 vim/dirindex.html                | 35 +++++++++++++++++++++++++++
 vim/index.html                   |  1 +
 17 files changed, 159 insertions(+), 9 deletions(-)
 create mode 100644 dirindex.html
 create mode 120000 index.html
 create mode 100644 vim/.vim/bundle/dirindex.html
 create mode 120000 vim/.vim/bundle/index.html
 create mode 100644 vim/.vim/dirindex.html
 create mode 120000 vim/.vim/index.html
 create mode 100644 vim/dirindex.html
 create mode 120000 vim/index.html

diff --git a/dirindex.html b/dirindex.html
new file mode 100644
index 0000000..e34400c
--- /dev/null
+++ b/dirindex.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <link rel=stylesheet type="text/css" href="../style.css">
+   <title>Directory Index: dots</title>
+</head>
+<body>
+
+<table class="toptable dirtop"><tr><td>
+<p class="toptitle"><a href="../dirindex.html">(root)</a>
+ / 
+<a href="dirindex.html">dots</a></p>
+<p class="topsubtitle">Directory Index</p>
+</td></tr></table>
+
+<div class="mininav">
+<a href="../dirindex.html">Root</a> |
+<a href="../allindex.html">Global</a> |
+<a href="../sortindex.html">Sorted</a>
+</div>
+
+<h3>Sub-directories:</h3>
+<ul>
+<li><a href="vim/dirindex.html">vim</a></li>
+</ul><p>
+
+
+
+
+
+</body>
+</html>
diff --git a/index.html b/index.html
new file mode 120000
index 0000000..0fc8e54
--- /dev/null
+++ b/index.html
@@ -0,0 +1 @@
+dirindex.html
\ No newline at end of file
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/dirindex.html b/vim/.vim/bundle/dirindex.html
new file mode 100644
index 0000000..e0d05d4
--- /dev/null
+++ b/vim/.vim/bundle/dirindex.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <link rel=stylesheet type="text/css" href="../../../../style.css">
+   <title>Directory Index: dots/vim/.vim/bundle</title>
+</head>
+<body>
+
+<table class="toptable dirtop"><tr><td>
+<p class="toptitle"><a href="../../../../dirindex.html">(root)</a>
+ / 
+<a href="../../../dirindex.html">dots</a>
+ / 
+<a href="../../dirindex.html">vim</a>
+ / 
+<a href="../dirindex.html">.vim</a>
+ / 
+<a href="dirindex.html">bundle</a></p>
+<p class="topsubtitle">Directory Index</p>
+</td></tr></table>
+
+<div class="mininav">
+<a href="../../../../dirindex.html">Root</a> |
+<a href="../../../../allindex.html">Global</a> |
+<a href="../../../../sortindex.html">Sorted</a>
+</div>
+
+<h3>Sub-directories:</h3>
+<ul>
+<li><a href="jedi-vim/dirindex.html">jedi-vim</a></li>
+<li><a href="nerdtree/dirindex.html">nerdtree</a></li>
+<li><a href="syntastic/dirindex.html">syntastic</a></li>
+</ul><p>
+
+
+
+
+
+</body>
+</html>
diff --git a/vim/.vim/bundle/index.html b/vim/.vim/bundle/index.html
new file mode 120000
index 0000000..0fc8e54
--- /dev/null
+++ b/vim/.vim/bundle/index.html
@@ -0,0 +1 @@
+dirindex.html
\ No newline at end of file
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..6781eb1 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit 6781eb17dad705eab1d1d932ebf3b1871a90c783
diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer
index 1c090e0..128ddaa 160000
--- a/vim/.vim/bundle/lightline-buffer
+++ b/vim/.vim/bundle/lightline-buffer
@@ -1 +1 @@
-Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca
+Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..41fb97e 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..6188c5e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..d17b98c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..b1df5f1 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit b1df5f1226676ae52380a214e0b13af1250951cd
diff --git a/vim/.vim/dirindex.html b/vim/.vim/dirindex.html
new file mode 100644
index 0000000..aae61be
--- /dev/null
+++ b/vim/.vim/dirindex.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <link rel=stylesheet type="text/css" href="../../../style.css">
+   <title>Directory Index: dots/vim/.vim</title>
+</head>
+<body>
+
+<table class="toptable dirtop"><tr><td>
+<p class="toptitle"><a href="../../../dirindex.html">(root)</a>
+ / 
+<a href="../../dirindex.html">dots</a>
+ / 
+<a href="../dirindex.html">vim</a>
+ / 
+<a href="dirindex.html">.vim</a></p>
+<p class="topsubtitle">Directory Index</p>
+</td></tr></table>
+
+<div class="mininav">
+<a href="../../../dirindex.html">Root</a> |
+<a href="../../../allindex.html">Global</a> |
+<a href="../../../sortindex.html">Sorted</a>
+</div>
+
+<h3>Sub-directories:</h3>
+<ul>
+<li><a href="bundle/dirindex.html">bundle</a></li>
+</ul><p>
+
+
+
+
+
+</body>
+</html>
diff --git a/vim/.vim/index.html b/vim/.vim/index.html
new file mode 120000
index 0000000..0fc8e54
--- /dev/null
+++ b/vim/.vim/index.html
@@ -0,0 +1 @@
+dirindex.html
\ No newline at end of file
diff --git a/vim/.vimrc b/vim/.vimrc
index 4745d72..86cc628 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -53,7 +53,7 @@ nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 " use jk to escape insert mode - using easyescape plugin 
 let g:easyescape_chars = { "j": 1, "k": 1 }
-let g:easyescape_timeout = 100
+"let g:easyescape_timeout = 100
 cnoremap jk <ESC>
 cnoremap kj <ESC>
 
diff --git a/vim/dirindex.html b/vim/dirindex.html
new file mode 100644
index 0000000..819e04b
--- /dev/null
+++ b/vim/dirindex.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <link rel=stylesheet type="text/css" href="../../style.css">
+   <title>Directory Index: dots/vim</title>
+</head>
+<body>
+
+<table class="toptable dirtop"><tr><td>
+<p class="toptitle"><a href="../../dirindex.html">(root)</a>
+ / 
+<a href="../dirindex.html">dots</a>
+ / 
+<a href="dirindex.html">vim</a></p>
+<p class="topsubtitle">Directory Index</p>
+</td></tr></table>
+
+<div class="mininav">
+<a href="../../dirindex.html">Root</a> |
+<a href="../../allindex.html">Global</a> |
+<a href="../../sortindex.html">Sorted</a>
+</div>
+
+<h3>Sub-directories:</h3>
+<ul>
+<li><a href=".vim/dirindex.html">.vim</a></li>
+</ul><p>
+
+
+
+
+
+</body>
+</html>
diff --git a/vim/index.html b/vim/index.html
new file mode 120000
index 0000000..0fc8e54
--- /dev/null
+++ b/vim/index.html
@@ -0,0 +1 @@
+dirindex.html
\ No newline at end of file

From cb8d5ead688ef80c3d3d290caf7e4b55b98bfc46 Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sun, 24 Jun 2018 15:15:18 -0500
Subject: [PATCH 24/28] ugh

---
 bash/.bashrc                  | 1 +
 vim/.vim/bundle/Vundle.vim    | 2 +-
 vim/.vim/bundle/calendar.vim  | 2 +-
 vim/.vim/bundle/jedi-vim      | 2 +-
 vim/.vim/bundle/lightline.vim | 2 +-
 vim/.vim/bundle/nerdtree      | 2 +-
 vim/.vim/bundle/syntastic     | 2 +-
 vim/.vim/bundle/vim-fugitive  | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 8f63c90..bc9e815 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -21,3 +21,4 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+alias p='ping'
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..25009a8 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 25009a8eeae8ecca0c0d74f06f62ad82d2557c1c
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..48af2af 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..78c43c1 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..ed446e5 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit ed446e5cbe0733a8f98befc88d33e42edebb67d2
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..b7b473b 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..b82abd5 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45

From f9777101cfb6c31a8320aba35869419e0bdd6626 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sun, 24 Jun 2018 15:27:25 -0500
Subject: [PATCH 25/28] Testing conflict resolution

---
 bash/.bashrc | 1 +
 vim/.vimrc   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 4e8f7f8..16474f1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,6 +24,7 @@ alias ll='ls -lh'
 alias p='ping'
 alias s='sudo'
 alias ip='ip -c'
+alias fart='/usr/bin/sleep'
 
 #golang stuff
 export GOPATH=$HOME/gopath
diff --git a/vim/.vimrc b/vim/.vimrc
index a148695..a8e7047 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -27,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
 set cursorline
 
 "enable relative line numbers
-set number relativenumber
+"set number relativenumber
 
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>

From 02be8e62b47cdd5c8dbff4f3ea7edb056dce8307 Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sun, 24 Jun 2018 15:29:23 -0500
Subject: [PATCH 26/28] Testing conflict

---
 bash/.bashrc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 50128b0..b063da7 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -22,11 +22,9 @@ alias l='ls -lh --color=auto'
 alias ll='ls -lh --color=auto'
 alias p='ping'
 alias s='sudo'
-<<<<<<< HEAD
 alias dmesg='dmesg -H'
-=======
 alias ip='ip -c'
->>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
+alias poop='/usr/bin/sleep'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -35,13 +33,10 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-<<<<<<< HEAD
 alias p='ping'
-=======
 
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
 bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
->>>>>>> 8f3230921e0db7fc1f6198ef62604af9b1e6b833

From b30b90d1e045ebf3334e82d20d2d982247d63f2c Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sun, 8 Jul 2018 10:57:51 -0500
Subject: [PATCH 27/28] Added F12 for inner/outer during nested tmux

---
 tmux/.tmux.conf | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index e905e7f..aab9dca 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -43,6 +43,9 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
 bind-key Tab last-window
 bind-key BTab previous-window
 
+# prefix-r to reload tmux config
+bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+
 # Basic status bar colors
 set-option -g status-bg default
 set-option -g status-fg white
@@ -74,3 +77,25 @@ set-option -g display-panes-active-colour brightwhite
 # Clock mode
 set-option -g clock-mode-colour white
 set-option -g clock-mode-style 24
+
+# use F12 to move to inner/outer tmux sessions when nested
+# https://medium.freecodecamp.org/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795
+bind -T root F12 \
+	set prefix None \;\
+	set key-table off \;\
+    set window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W " \;\
+    set window-status-current-format "#[fg=colour18,bg=brightblac] #I #[fg=white,bg=blac] #W " \;\
+    set status-bg black \;\
+    set status-left "#[fg=white,bg=blac] #S #[fg=default,bg=default] " \;\
+    set status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=white,bg=blac] #(whoami)@#h " \;\
+    if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\
+    display-message "ENTER inner tmux ..."
+bind -T off F12 \
+	set -u prefix \;\
+	set -u key-table \;\
+    set -u window-status-format \;\
+    set -u window-status-current-format \;\
+    set -u status-left \;\
+    set -u status-right \;\
+    set -u status-bg \;\
+    display-message "EXIT inner tmux ..."

From 4009da94841e784ad85e3e9fde7f6146d8627c23 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 21 Jul 2018 11:08:25 -0500
Subject: [PATCH 28/28] Fixed pager (less) options to deal with ansi esc
 sequences

---
 bash/.bashrc                  | 2 +-
 vim/.vim/bundle/calendar.vim  | 2 +-
 vim/.vim/bundle/jedi-vim      | 2 +-
 vim/.vim/bundle/lightline.vim | 2 +-
 vim/.vim/bundle/nerdtree      | 2 +-
 vim/.vim/bundle/syntastic     | 2 +-
 vim/.vim/bundle/vim-fugitive  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 7497146..9d5ea2f 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -14,7 +14,7 @@ fi
 #-I case insensitive
 #-j 5 show X lines above search for context
 ## 4 - right/left four chars
-export LESS='-C -M -I -j 5 -# 4'
+export LESS='-C -M -I -j 5 -# 4 -R'
 
 # User specific aliases and functions
 alias l.='ls -lh --color=auto' 2>/dev/null
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 25009a8..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 25009a8eeae8ecca0c0d74f06f62ad82d2557c1c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 48af2af..f07ff6a 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
+Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index 78c43c1..41fb97e 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
+Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index ed446e5..6188c5e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit ed446e5cbe0733a8f98befc88d33e42edebb67d2
+Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index b7b473b..d17b98c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4
+Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index b82abd5..b14434b 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45
+Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2