From 3ce031be9f45c6d8cb5890e90873ede6f95c27e4 Mon Sep 17 00:00:00 2001
From: Bill Niblock <bill_niblock@yahoo.com>
Date: Fri, 27 Nov 2015 21:10:39 -0500
Subject: [PATCH] Refactored and reformatted

---
 tmux/tmux.conf    | 13 +++++++++++++
 vim/README.md     | 18 +++++++++++-------
 vim/vimrc         |  2 +-
 vim/vimrc.bundles | 17 ++++++++++++++++-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 29f8740..dd60fed 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -102,3 +102,16 @@ bind r source-file ~/.tmux.conf \; display "Config Reloaded!"
 
 # Capture a pane into file for uploading to Gist
 bind-key u capture-pane \; save-buffer /tmp/tmux-buffer
+
+######
+# Plugins
+###
+
+# TPM - Tmux Plugin Manager
+set -g @plugin 'tmux-plugins/tpm'
+
+# Session related
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+
+# Run TPM
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/vim/README.md b/vim/README.md
index 2bea13c..00d6960 100644
--- a/vim/README.md
+++ b/vim/README.md
@@ -2,14 +2,18 @@
 
 My vim configuration is relatively straight forward.
 
-###RC File
+##Config File
 * Word-wrap is set to 80 characters
 * Mappings to quickly edit dotfiles
 * Relative numbering, with mapping to quickly swap
 
-###Bundles File
-The vimrc.bundles file stores the plugin information for Vim-Plug. Currently, I
-use the following plugins:
+##Bundles File
+The vimrc.bundles file stores the plugin information for
+[Vim-Plug](https://github.com/junegunn/vim-plug). Included in the file is a
+command to check for and pull-down the vim-plug files, if not previously
+installed.
+
+####Notable Plugins
 * [Fugitive](https://github.com/tpope/vim-fugitive) for nice Git integration.
 * [Airline](https://github.com/bling/vim-airline) to look nice, but not garish.
 * [Sneak](https://github.com/justinmk/vim-sneak) for getting around.
@@ -17,14 +21,14 @@ use the following plugins:
   browser.
 * [Templates](https://github.com/ap/vim-templates.git) for easy templates.
 * [vimwiki](https://github.com/vimwiki/vimwiki) for info, diary and notes.
+* [Startify](https://github.com/mhinz/vim-startify) for a nice start-page
 
-###Pending Plugins
+####Pending Plugins
 The following should be eventually installed and configured properly:
 * Syntastic
-* vim-startify
 * vim-dispatch
 
-####To-Do
+##To-Do
 * [ ] Customize Airline more (Optional)
 * [ ] Consider adding [gist-vim](https://github.com/mattn/gist-vim) due to
   prevalence of Gist at work
diff --git a/vim/vimrc b/vim/vimrc
index 70e54bb..1ea0976 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,7 +37,7 @@ set softtabstop=5
 " Set width; word wrap; scroll mods
 set scrolloff=5
 set tw=80
-set colorcolumn
+set colorcolumn=80
 set wrap
 
 " Enable auto-completion for vim commands
diff --git a/vim/vimrc.bundles b/vim/vimrc.bundles
index e197132..28e821c 100644
--- a/vim/vimrc.bundles
+++ b/vim/vimrc.bundles
@@ -12,7 +12,17 @@
 " ###
 
 " ######
-" # Fetch
+" # Fetch & Install Self
+" ###
+
+if empty(glob('~/.vim/autoload/plug.vim'))
+     silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+          \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+     autocmd VimEnter * PlugInstall | source $MYVIMRC
+endif
+
+" ######
+" # Fetch & Install Plugins
 " ###
 
 call plug#begin('~/.vim/bundle')
@@ -35,3 +45,8 @@ call plug#end()
 " Airline configuration
 set laststatus=2
 let g:airline_powerline_fonts = 1
+
+" Startify configs
+let g:startify_files_number = 5
+let g:startify_change_to_dir = 1
+