summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris <[email protected]>2020-11-04 03:12:20 -0500
committerChris <[email protected]>2020-11-04 03:12:20 -0500
commite7c6d7d37d0e5c288bf82a041f5cbc484cbe3921 (patch)
treed5f0af4df480a9254b5a1097e7db6bc919faf72d
parent78fb2c072fef3a08d9bdc9788bbd9b89311b933c (diff)
updated some new fzf commands
-rw-r--r--keys/which-key.vim65
-rw-r--r--plug-config/coc/coc-extensions.vim1
-rw-r--r--vim-plug/plugins.vim1
3 files changed, 58 insertions, 9 deletions
diff --git a/keys/which-key.vim b/keys/which-key.vim
index ba3cc1da..d8f3da21 100644
--- a/keys/which-key.vim
+++ b/keys/which-key.vim
@@ -129,26 +129,58 @@ let g:which_key_map.m = {
" CoC throws an error
" \ 'a' : [':CocCommand bookmark.annotate', 'annotate bookmark'],
+" " s is for search
+" let g:which_key_map.s = {
+" \ 'name' : '+search' ,
+" \ '/' : [':History/' , 'history'],
+" \ ';' : [':Commands' , 'commands'],
+" \ 'a' : [':Ag' , 'text Ag'],
+" \ 'b' : [':BLines' , 'current buffer'],
+" \ 'B' : [':Buffers' , 'open buffers'],
+" \ 'c' : [':Commits' , 'commits'],
+" \ 'C' : [':BCommits' , 'buffer commits'],
+" \ 'f' : [':Files' , 'files'],
+" \ 'g' : [':GFiles' , 'git files'],
+" \ 'G' : [':GFiles?' , 'modified git files'],
+" \ 'h' : [':History' , 'file history'],
+" \ 'H' : [':History:' , 'command history'],
+" \ 'l' : [':Lines' , 'lines'] ,
+" \ 'm' : [':Marks' , 'marks'] ,
+" \ 'M' : [':Maps' , 'normal maps'] ,
+" \ 'p' : [':Helptags' , 'help tags'] ,
+" \ 'P' : [':Tags' , 'project tags'],
+" \ 's' : [':CocList snippets' , 'snippets'],
+" \ 'S' : [':Colors' , 'color schemes'],
+" \ 't' : [':Rg' , 'text Rg'],
+" \ 'T' : [':BTags' , 'buffer tags'],
+" \ 'w' : [':Windows' , 'search windows'],
+" \ 'y' : [':Filetypes' , 'file types'],
+" \ 'z' : [':FZF' , 'FZF'],
+" \ }
+ " \ 's' : [':Snippets' , 'snippets'],
+
" s is for search
let g:which_key_map.s = {
\ 'name' : '+search' ,
\ '/' : [':History/' , 'history'],
- \ ';' : [':Commands' , 'commands'],
+ \ ';' : [':FzfPreviewCommandPalette' , 'commands'],
\ 'a' : [':Ag' , 'text Ag'],
- \ 'b' : [':BLines' , 'current buffer'],
- \ 'B' : [':Buffers' , 'open buffers'],
+ \ 'b' : [':CocCommand fzf-preview.BufferLines' , 'current buffer'],
+ \ 'B' : [':CocCommand fzf-preview.Buffers' , 'open buffers'],
\ 'c' : [':Commits' , 'commits'],
\ 'C' : [':BCommits' , 'buffer commits'],
- \ 'f' : [':Files' , 'files'],
- \ 'g' : [':GFiles' , 'git files'],
+ \ 'd' : [':CocCommand fzf-preview.DirectoryFiles' , 'directories'],
+ \ 'f' : [':CocCommand fzf-preview.ProjectFiles' , 'files'],
+ \ 'g' : [':CocCommand fzf-preview.GitFiles' , 'git files'],
\ 'G' : [':GFiles?' , 'modified git files'],
\ 'h' : [':History' , 'file history'],
\ 'H' : [':History:' , 'command history'],
\ 'l' : [':Lines' , 'lines'] ,
- \ 'm' : [':Marks' , 'marks'] ,
+ \ 'm' : [':CocCommand fzf-preview.Marks', 'list marks'],
\ 'M' : [':Maps' , 'normal maps'] ,
\ 'p' : [':Helptags' , 'help tags'] ,
\ 'P' : [':Tags' , 'project tags'],
+ \ 'q' : [':CocCommand fzf-preview.QuickFix' , 'quickfix list'],
\ 's' : [':CocList snippets' , 'snippets'],
\ 'S' : [':Colors' , 'color schemes'],
\ 't' : [':Rg' , 'text Rg'],
@@ -157,7 +189,17 @@ let g:which_key_map.s = {
\ 'y' : [':Filetypes' , 'file types'],
\ 'z' : [':FZF' , 'FZF'],
\ }
- " \ 's' : [':Snippets' , 'snippets'],
+"
+" :CocCommand fzf-preview.AllBuffers
+" :CocCommand fzf-preview.Changes
+" :CocCommand fzf-preview.Yankround
+" :CocCommand fzf-preview.CocReferences
+" :CocCommand fzf-preview.CocDiagnostics
+" :CocCommand fzf-preview.CocCurrentDiagnostics
+" :CocCommand fzf-preview.CocTypeDefinitions
+" \ 'l' : [':CocCommand fzf-preview.Bookmarks', 'list bookmarks'],
+" $FZF_PREVIEW_PREVIEW_BAT_THEME = 'ansi-dark'
+"
let g:which_key_map.S = {
\ 'name' : '+Session' ,
@@ -172,7 +214,7 @@ let g:which_key_map.S = {
let g:which_key_map.g = {
\ 'name' : '+git' ,
\ 'a' : [':Git add .' , 'add all'],
- \ 'A' : [':Git add %' , 'add current'],
+ \ 'A' : [':CocCommand fzf-preview.GitStatus' , 'actions'],
\ 'b' : [':Git blame' , 'blame'],
\ 'B' : [':GBrowse' , 'browse'],
\ 'c' : [':Git commit' , 'commit'],
@@ -191,12 +233,17 @@ let g:which_key_map.g = {
\ 'P' : [':Git pull' , 'pull'],
\ 'r' : [':GRemove' , 'remove'],
\ 's' : ['<Plug>(GitGutterStageHunk)' , 'stage hunk'],
- \ 'S' : [':!git status' , 'status'],
+ \ 'S' : [':CocCommand fzf-preview.GitStatus' , 'status'],
\ 't' : [':GitGutterSignsToggle' , 'toggle signs'],
\ 'u' : ['<Plug>(GitGutterUndoHunk)' , 'undo hunk'],
\ 'v' : [':GV' , 'view commits'],
\ 'V' : [':GV!' , 'view buffer commits'],
\ }
+ " \ 'A' : [':Git add %' , 'add current'],
+ " \ 'S' : [':!git status' , 'status'],
+"
+"
+"
let g:which_key_map.G = {
\ 'name' : '+gist' ,
diff --git a/plug-config/coc/coc-extensions.vim b/plug-config/coc/coc-extensions.vim
index 1466aafc..28e17c62 100644
--- a/plug-config/coc/coc-extensions.vim
+++ b/plug-config/coc/coc-extensions.vim
@@ -10,6 +10,7 @@ let g:coc_global_extensions = [
\ 'coc-pairs',
\ 'coc-tsserver',
\ 'coc-floaterm',
+ \ 'coc-fzf-preview',
\ 'coc-html',
\ 'coc-css',
\ 'coc-cssmodules',
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index 85594a4c..5cf73268 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -59,6 +59,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'kevinhwang91/rnvimr'
" FZF
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+ Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release', 'do': ':UpdateRemotePlugins' }
Plug 'junegunn/fzf.vim'
" Git
Plug 'airblade/vim-gitgutter'