From a67a024745eaae7775a00864dacd19c638791e33 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Fri, 31 May 2013 10:29:50 -0500
Subject: [PATCH] cleaning up tmux.conf and some small additions

+ adding back in the vitality plugin
+ turned back on the mouse mode in tmux (for clicking between windows in
tmux)
+ cleaning up some duplications in tmux.conf
---
 tmux/tmux.conf.symlink | 27 ++++++++++++---------------
 vim/vimrc.symlink      |  9 +++++++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index a414103..16b100a 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -17,11 +17,8 @@ bind C-a send-prefix
 setw -g monitor-activity off
 set -g visual-activity off
 
-# reattach to user namespace
-# set-option -g default-command "reattach-to-user-namespace -l zsh"
-
-# Rather than constraining window size to the maximum size of any client 
-# connected to the *session*, constrain window size to the maximum size of any 
+# Rather than constraining window size to the maximum size of any client
+# connected to the *session*, constrain window size to the maximum size of any
 # client connected to *that window*. Much more reasonable.
 setw -g aggressive-resize on
 
@@ -55,10 +52,6 @@ bind r source-file ~/.tmux.conf \; display "Config Reloaded!"
 # quickly open a new window
 bind N new-window
 
-# Activity
-setw -g monitor-activity on
-set -g visual-activity off
-
 # split window
 bind | split-window -h
 bind - split-window -v
@@ -81,11 +74,11 @@ bind -r J resize-pane -D 10
 bind -r K resize-pane -U 10
 bind -r L resize-pane -R 10
 
-# enable mouse mode
-setw -g mode-mouse off
-set -g mouse-select-pane off
-set -g mouse-resize-pane off
-set -g mouse-select-window off
+# set mouse mode
+setw -g mode-mouse on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
+set -g mouse-select-window on
 
 # maximizing and restoring windows
 unbind Up
@@ -103,6 +96,10 @@ bind p paste-buffer
 bind -t vi-copy 'v' begin-selection
 bind -t vi-copy 'y' copy-selection
 
+# Buffers to/from Mac clipboard, yay tmux book from pragprog
+bind C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
+bind C-v run "tmux set-buffer $(reattach-to-user-namespace pbpaste); tmux paste-buffer")
+
 ######################
 ### Color Settings ###
 ######################
@@ -162,6 +159,6 @@ set -g window-status-format "#[fg=colour239] #I #W "
 
 # set -g window-status-current-format "#[fg=colour0,bg=colour26]#[fg=colour16,bg=colour26,noreverse,bold] #I #W #[fg=colour26,nobold]"
 set -g window-status-current-format "#[fg=colour0]#[fg=colour202,noreverse,bold] #I #W #[fg=colour26,nobold]"
-set -g status-left $tm_session_name 
+set -g status-left $tm_session_name
 set -g status-right $tm_itunes_track' '$tm_rdio_track' '$tm_battery' '$tm_date' '$tm_host
 
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index a00676a..c9cce2f 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -1,4 +1,4 @@
-" vim settings
+"M7 vim settings
 
 filetype off
 set rtp+=~/.vim/bundle/vundle/
@@ -25,6 +25,7 @@ Bundle 'Lokaltog/vim-powerline'
 Bundle 'tpope/vim-ragtag'
 Bundle 'tpope/vim-surround'
 Bundle 'duff/vim-scratch'
+Bundle 'sjl/vitality.vim'
 Bundle 'cakebaker/scss-syntax.vim'
 Bundle 'kchmck/vim-coffee-script'
 Bundle 'groenewege/vim-less'
@@ -70,6 +71,10 @@ set shiftwidth=4
 set tabstop=4
 set softtabstop=4
 
+" if has('mouse')
+"     set mouse=a
+" endif
+
 " faster redrawing
 set ttyfast
 
@@ -118,7 +123,7 @@ set showcmd " show incomplete commands
 set noshowmode " don't show which mode disabled for PowerLine
 set wildmode=list:longest " complete files like a shell
 set scrolloff=3 " lines of text around cursor
-set shell=/bin/zsh
+set shell=$SHELL
 set ruler " show postiion in file
 set cmdheight=1 " command bar height