diff options
| -rw-r--r-- | tmux/.tmux.conf | 2 | ||||
| -rw-r--r-- | vim/.vimrc | 18 | ||||
| -rw-r--r-- | zsh/.zshrc | 6 |
3 files changed, 7 insertions, 19 deletions
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 71bc79d..342c275 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -21,4 +21,4 @@ bind-key N swap-window -t +1 WINTAB_BOUNDARY=create WINTAB_MODE=wintab WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab -source-file $WINTAB_ROOT/wintab.tmux.conf +source-file $WINTAB_ROOT/wintab.tmux @@ -60,6 +60,7 @@ 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 '~/Dropbox/projects/vim-wintab' @@ -382,6 +383,8 @@ inoreabbrev <expr> #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype " Spell inoremap <c-s> <esc>1z=eA +nmap co =o + " }}} "" Colorscheme {{{ function! SaveColo(...) @@ -525,18 +528,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> -" }}} @@ -47,9 +47,9 @@ fi [ ! -d ~/.zsh/zgen ] && git clone https://github.com/tarjoilija/zgen.git ~/.zsh/zgen source "$HOME/.zsh/zgen/zgen.zsh" -# export WINTAB_MODE="winonly" -export WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab -source $WINTAB_ROOT/wintab.plugin.zsh +if [ "$TMUX" != "" ]; then + source $WINTAB_ROOT/wintab.plugin.zsh +fi if ! zgen saved; then echo "Creating a zgen save" |