summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keys/which-key.vim27
-rw-r--r--plug-config/far.vim6
-rw-r--r--vim-plug/plugins.vim3
3 files changed, 22 insertions, 14 deletions
diff --git a/keys/which-key.vim b/keys/which-key.vim
index 4326a17f..30e6703a 100644
--- a/keys/which-key.vim
+++ b/keys/which-key.vim
@@ -36,7 +36,7 @@ let g:which_key_map[';'] = [ ':Commands' , 'commands' ]
let g:which_key_map['='] = [ '<C-W>=' , 'balance windows' ]
let g:which_key_map['d'] = [ ':Bdelete' , 'delete buffer']
let g:which_key_map['e'] = [ ':CocCommand explorer' , 'explorer' ]
-let g:which_key_map['f'] = [ ':Farr --win-width=30' , 'find and replace' ]
+" let g:which_key_map['f'] = [ ':Farr' , 'find and replace' ]
let g:which_key_map['h'] = [ '<C-W>s' , 'split below']
let g:which_key_map['m'] = [ ':call WindowSwap#EasyWindowSwap()' , 'move window' ]
let g:which_key_map['p'] = [ ':Files' , 'search files' ]
@@ -70,15 +70,22 @@ let g:which_key_map.a = {
" b is for buffer
let g:which_key_map.b = {
\ 'name' : '+buffer' ,
- \ '1' : ['b1' , 'buffer 1'] ,
- \ '2' : ['b2' , 'buffer 2'] ,
- \ 'd' : [':Bdelete' , 'delete-buffer'] ,
- \ 'f' : ['bfirst' , 'first-buffer'] ,
- \ 'h' : ['Startify' , 'home-buffer'] ,
- \ 'l' : ['blast' , 'last-buffer'] ,
- \ 'n' : ['bnext' , 'next-buffer'] ,
- \ 'p' : ['bprevious' , 'previous-buffer'] ,
- \ '?' : ['Buffers' , 'fzf-buffer'] ,
+ \ '1' : ['b1' , 'buffer 1'],
+ \ '2' : ['b2' , 'buffer 2'],
+ \ 'd' : [':Bdelete' , 'delete-buffer'],
+ \ 'f' : ['bfirst' , 'first-buffer'],
+ \ 'h' : ['Startify' , 'home-buffer'],
+ \ 'l' : ['blast' , 'last-buffer'],
+ \ 'n' : ['bnext' , 'next-buffer'],
+ \ 'p' : ['bprevious' , 'previous-buffer'],
+ \ '?' : ['Buffers' , 'fzf-buffer'],
+ \ }
+
+" f is for find and replace
+let g:which_key_map.f = {
+ \ 'name' : '+find & replace' ,
+ \ 'b' : [':Farr --source=vimgrep' , 'buffer'],
+ \ 'p' : [':Farr --source=rgnvim' , 'project'],
\ }
" k is for task
diff --git a/plug-config/far.vim b/plug-config/far.vim
index e68cecec..e2e42a29 100644
--- a/plug-config/far.vim
+++ b/plug-config/far.vim
@@ -5,12 +5,12 @@ let g:far#source='rgnvim'
set lazyredraw " improve scrolling performance when navigating through large results
-let g:far#window_width=30
-let g:far#file_mask_favorites=['%', '**/*.*', '**/*.js', '**/*.py', '**/*.java', '**/*.css', '**/*.html', '**/*.vim', '**/*.cpp', '**/*.c', '**/*.h', ]
+let g:far#window_width=60
+" Use %:p with buffer option only
+let g:far#file_mask_favorites=['%:p', '**/*.*', '**/*.js', '**/*.py', '**/*.java', '**/*.css', '**/*.html', '**/*.vim', '**/*.cpp', '**/*.c', '**/*.h', ]
let g:far#window_min_content_width=30
let g:far#enable_undo=1
-
" let g:far#ignore_files=['$HOME/.config/nvim/utils/farignore']
" let g:far#ignore_files=['node_modules/']
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index 5f84db8a..513937ac 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -46,7 +46,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'neoclide/coc.nvim', {'branch': 'release'}
" Status Line
Plug 'vim-airline/vim-airline'
- Plug 'kevinhwang91/rnvimr', {'do': 'make sync'}
+ Plug 'kevinhwang91/rnvimr'
" FZF
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
@@ -81,6 +81,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'RRethy/vim-illuminate'
" Find and replace
Plug 'ChristianChiarulli/far.vim'
+ " Plug 'brooth/far.vim'
" Auto change html tags
Plug 'AndrewRadev/tagalong.vim'
" live server