Mostly tmux stuff

.dotprivate

@@ -1 +1 @@
-Subproject commit bd195f92b8c5f52302375189e9b775c351609ef4
+Subproject commit ec48ddf86b61674fe5d0189ab013090249e8904f

hammerspoon/init.lua

@@ -1 +0,0 @@
-

tmux/tmux.conf

@@ -6,12 +6,12 @@ set -g pane-base-index 1
 
 # Remap prefix to Control + \
 unbind-key C-b
-set -g prefix 'C-\'
-bind-key 'C-\' send-prefix
+set -g prefix 'C-o'
+bind-key 'C-o' send-prefix
 
 # Force a reload of the config file
 unbind r
-bind r source-file ~/.tmux.conf
+bind r source-file ~/.tmux.conf; display 'Config reloaded!'
 
 # Quick pane cycling
 unbind ^A
@@ -31,10 +31,17 @@ setw -g mouse on
 
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-battery'
+set -g @plugin 'tmux-plugins/tmux-cpu'
+set -g @plugin 'tmux-plugins/tmux-online-status'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'seebi/tmux-colors-solarized'
 set -g @colors-solarized 'dark'
 
+set -g pane-border-fg black
+set -g pane-active-border-fg brightred
+
 #set -g status-left '#(whoami)@#(hostname -s)'
 #set -g status-right 'Batt: #{battery_icon} #{battery_percentage} #{battery_remain} | %a %h-%d %H:%M '
 #set -g status-right '#(cut -d " " -f 1-3 /proc/loadavg) %y-%m-%d %H:%M' 1

vim/vimrc

@@ -89,6 +89,7 @@ Bundle 'pangloss/vim-javascript.git'
 Bundle 'scrooloose/syntastic'
 Bundle 'shawncplus/phpcomplete.vim'
 "Bundle 'SearchComplete'
+Plugin 'tmux-plugins/vim-tmux'
 
 syntax enable
 set background=dark