From 1ed3c86834671e305ccf3ed0cf554c0a2511ddd3 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sat, 14 Apr 2018 22:52:29 +0100
Subject: Remove custom zoom

---
 tmux/.tmux.conf |  9 ++-------
 vim/.vimrc      | 19 +++----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9baf9f3..03e5790 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -12,15 +12,10 @@ bind r source-file ~/.tmux.conf
 set -sg escape-time 0
 set-option -g allow-rename off
 
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-bind -n C-h if-shell "$is_vim" "send-keys C-h" 'if-shell "[ #{pane_at_left} -eq 1 ]" "select-window -p" "select-pane -L"'
-bind -n C-l if-shell "$is_vim" "send-keys C-l" 'if-shell "[ #{pane_at_right} -eq 1 ]" "select-window -n" "select-pane -R"'
-bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
-bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
-
 bind -n C-Left  previous-window
 bind -n C-Right next-window
 
 bind-key P swap-window -t -1
 bind-key N swap-window -t +1
+
+source-file ~/.vim/plugged/vim-wintab/tmux/wintab.tmux.conf
diff --git a/vim/.vimrc b/vim/.vimrc
index a50e392..a84c062 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -59,8 +59,10 @@ Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
+Plug 'troydm/zoomwintab.vim'
 Plug 'urbainvaes/vim-remembrall'
-Plug 'urbainvaes/vim-wintab'
+" Plug 'urbainvaes/vim-wintab'
+Plug '~/Dropbox/projects/vim-wintab'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'vim-scripts/ReplaceWithRegister'
@@ -516,18 +518,3 @@ if has("nvim")
     nnoremap <A-l> <C-w>l
 endif
 " }}}
-"" Zoom / Restore window {{{
-function! s:ZoomToggle() abort
-    if exists('t:zoomed') && t:zoomed
-        execute t:zoom_winrestcmd
-        let t:zoomed = 0
-    else
-        let t:zoom_winrestcmd = winrestcmd()
-        resize
-        vertical resize
-        let t:zoomed = 1
-    endif
-endfunction
-command! ZoomToggle call s:ZoomToggle()
-nnoremap <silent> <c-w>o :ZoomToggle<CR>
-" }}}
-- 
cgit v1.2.3