Merge remote-tracking branch 'origin'

.tmux.conf

@@ -1,3 +1,5 @@
+set-option -g default-command "reattach-to-user-namespace -l $SHELL"
+
 set-option -g status on
 set-option -g status-interval 2
 set-option -g utf8 on
@@ -26,6 +28,8 @@ bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
+bind i resize-pane -x 80
+
 bind e setw synchronize-panes on
 bind E setw synchronize-panes off
 
@@ -50,10 +54,37 @@ set-option -g display-time 4000
 
 bind r source-file ~/.tmux.conf; display-message "Config Reloaded"
 
+setw -g mode-mouse off
 set-option -g mouse-resize-pane off
 set-option -g mouse-select-pane off
 set-option -g mouse-select-window off
 
+# toggle mouse mode to allow mouse copy/paste
+# set mouse on with prefix m
+bind m \
+    set -g mode-mouse on \;\
+    set -g mouse-resize-pane on \;\
+    set -g mouse-select-pane on \;\
+    set -g mouse-select-window on \;\
+    display 'Mouse: ON'
+# set mouse off with prefix M
+bind M \
+    set -g mode-mouse off \;\
+    set -g mouse-resize-pane off \;\
+    set -g mouse-select-pane off \;\
+    set -g mouse-select-window off \;\
+    display 'Mouse: OFF'
+# zoom this pane to full screen
+bind + \
+    new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \;\
+    swap-pane -s tmux-zoom.0 \;\
+    select-window -t tmux-zoom
+# restore this pane
+bind - \
+    last-window \;\
+    swap-pane -s tmux-zoom.0 \;\
+    kill-window -t tmux-zoom
+
 # Vim like copy modes
 set-option -g status-keys vi
 unbind [

.vimrc

@@ -273,6 +273,7 @@
     " NERDTree {{{2
     " --------
         let NERDTreeIgnore=['\.pyc$']
+        let g:NERDTreeChDirMode=2
     " }}}
     " Python Mode Settings {{{2
     " --------------------
@@ -283,7 +284,8 @@
     " }}}
     " CtrlP Settings {{{2
     " --------------------
-        let g:crtlp_show_hidden = 1
+        let g:crtlp_show_hidden=1
+        let g:ctrlp_working_path_mode='rw'
     " }}}
 "" ======== }}}
 "  Mappings {{{1