Merge branch 'master' of ssh://fatmike/home/jon/dots

This commit is contained in:
jond
2017-09-24 17:13:35 -05:00
2 changed files with 7 additions and 5 deletions

View File

@@ -9,10 +9,6 @@ bind - split-window -v
unbind '"' unbind '"'
unbind % unbind %
# 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
set -g mouse on
# stop tmux from renaming the window every time you run a command # stop tmux from renaming the window every time you run a command
set-option -g allow-rename off set-option -g allow-rename off
set-option -g pane-active-border-fg blue set-option -g pane-active-border-fg blue
@@ -29,3 +25,9 @@ set -g base-index 1
# set vi modes # set vi modes
set -g status-keys vi set -g status-keys vi
set -g mode-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'

Submodule vim/.vim/bundle/vim-airline updated: e9a7a12d9e...d8eb12845f