From 26a8fff66ed8e996e60dd8ee896a23b49e860796 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 28 Oct 2019 09:47:24 +0000 Subject: Minor changes --- .mrconfig | 4 ++-- tmux/.tmux.conf | 13 +++++++------ vim/.vimrc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.mrconfig b/.mrconfig index 0bfd216..066521d 100644 --- a/.mrconfig +++ b/.mrconfig @@ -8,7 +8,7 @@ checkout = git clone 'git@github.com:urbainvaes/vim-remembrall.git' update = git pull origin master push = git push origin master -[$HOME/dotfiles/plugins/vim-wintab] -checkout = git clone 'git@github.com:urbainvaes/vim-wintab.git' +[$HOME/dotfiles/plugins/vim-tmux-pilot] +checkout = git clone 'git@github.com:urbainvaes/vim-tmux-pilot.git' update = git pull origin master push = git saveandsync diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 63a3799..c16febc 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -27,15 +27,16 @@ set-hook -g session-created "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set stat set-hook -g client-attached "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'" -# PILOT_KEY_H=M-h -# PILOT_KEY_J=M-j -# PILOT_KEY_K=M-k -# PILOT_KEY_L=M-l -# PILOT_KEY_P=M-backslash +# PILOT_KEY_H='M-h' +# PILOT_KEY_J='M-j' +# PILOT_KEY_K='M-k' +# PILOT_KEY_L='M-l' +# PILOT_KEY_P='M-\' + PILOT_IGNORE= PILOT_BOUNDARY=ignore PILOT_MODE=wintab -PILOT_ROOT=$HOME/dotfiles/plugins/vim-wintab +PILOT_ROOT=$HOME/dotfiles/plugins/vim-tmux-pilot source-file $PILOT_ROOT/pilot.tmux # Bind for clear-screen diff --git a/vim/.vimrc b/vim/.vimrc index abf20f6..dc878f7 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -553,3 +553,25 @@ endif "" Experimental {{{1 set wildcharm= nnoremap ,e :e **/* + +let $FZF_DEFAULT_OPTS='--layout=reverse' +let g:fzf_layout = { 'window': 'call FloatingFZF()' } + +function! FloatingFZF() + let buf = nvim_create_buf(v:false, v:true) + call setbufvar(buf, '&signcolumn', 'no') + + let height = &lines - 10 + let width = float2nr(&columns - (&columns * 2 / 10)) + let col = float2nr((&columns - width) / 2) + + let opts = { + \ 'relative': 'editor', + \ 'row': 5, + \ 'col': col, + \ 'width': width, + \ 'height': height + \ } + + call nvim_open_win(buf, v:true, opts) +endfunction -- cgit v1.2.3