diff --git a/README.md b/README.md index 1368887..80881b1 100644 --- a/README.md +++ b/README.md @@ -228,12 +228,10 @@ require'fzf-lua'.setup { 'f3:toggle-preview-wrap', 'shift-down:preview-page-down', 'shift-up:preview-page-up', - 'ctrl-d:half-page-down', - 'ctrl-u:half-page-up', - 'ctrl-f:page-down', - 'ctrl-b:page-up', - 'ctrl-a:toggle-all', - 'ctrl-l:clear-query', + 'ctrl-u:unix-line-discard', + 'ctrl-f:half-page-down', + 'ctrl-b:half-page-up', + 'alt-a:toggle-all', }, --[[ fzf_colors = { -- fzf '--color=' options ["fg"] = { "fg", "CursorLine" }, @@ -315,11 +313,13 @@ require'fzf-lua'.setup { file_icons = true, -- show file icons? color_icons = true, -- colorize file|git icons actions = { + -- set bind to 'false' to disable ["default"] = actions.file_edit, ["ctrl-s"] = actions.file_split, ["ctrl-v"] = actions.file_vsplit, ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, + ["alt-q"] = actions.file_sel_to_qf, + -- custom actions are available too ["ctrl-y"] = function(selected) print(selected[2]) end, } }, @@ -385,14 +385,6 @@ require'fzf-lua'.setup { git_icons = true, -- show git icons? file_icons = true, -- show file icons? color_icons = true, -- colorize file|git icons - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - ["ctrl-y"] = function(selected) print(selected[2]) end, - } }, oldfiles = { prompt = 'History❯ ', diff --git a/lua/fzf-lua/config.lua b/lua/fzf-lua/config.lua index 8fc513f..3b6c99f 100644 --- a/lua/fzf-lua/config.lua +++ b/lua/fzf-lua/config.lua @@ -40,23 +40,19 @@ M.globals = { fzf_binds = { -- toggle preview -- toggle preview text wrap - -- | page down|up - -- | half page down|up + -- | half page down|up -- | preview page down|up - -- toggle select-all -- clear query - -- send selected to quicfix - -- send all to quicfix + -- toggle select-all + -- send selected to quickfix 'f2:toggle-preview', 'f3:toggle-preview-wrap', 'shift-down:preview-page-down', 'shift-up:preview-page-up', - 'ctrl-d:half-page-down', - 'ctrl-u:half-page-up', - 'ctrl-f:page-down', - 'ctrl-b:page-up', - 'ctrl-a:toggle-all', - 'ctrl-l:clear-query', + 'ctrl-u:unix-line-discard', + 'ctrl-f:half-page-down', + 'ctrl-b:half-page-up', + 'alt-a:toggle-all', }, preview_border = 'border', preview_wrap = 'nowrap', @@ -147,7 +143,10 @@ M.globals.files = { ["ctrl-s"] = actions.file_split, ["ctrl-v"] = actions.file_vsplit, ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, + ["alt-q"] = actions.file_sel_to_qf, + ["ctrl-q"] = function() + utils.info("'ctrl-q|ctrl-a' has been deprecated in favor of 'alt-q|alt-a'") + end }, } -- Must construct our opts table in stages @@ -217,13 +216,7 @@ M.globals.grep = { git_untracked_cmd = M.globals.files.git_untracked_cmd, grep_opts = "--line-number --recursive --color=auto --perl-regexp", rg_opts = "--column --line-number --no-heading --color=always --smart-case", - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.oldfiles = { previewer = function() return M.globals.default_previewer end, @@ -233,13 +226,7 @@ M.globals.oldfiles = { git_icons = false, git_diff_cmd = M.globals.files.git_diff_cmd, git_untracked_cmd = M.globals.files.git_untracked_cmd, - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.quickfix = { previewer = function() return M.globals.default_previewer end, @@ -250,13 +237,7 @@ M.globals.quickfix = { git_icons = false, git_diff_cmd = M.globals.files.git_diff_cmd, git_untracked_cmd = M.globals.files.git_untracked_cmd, - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.loclist = { previewer = function() return M.globals.default_previewer end, @@ -267,13 +248,7 @@ M.globals.loclist = { git_icons = false, git_diff_cmd = M.globals.files.git_diff_cmd, git_untracked_cmd = M.globals.files.git_untracked_cmd, - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.buffers = { previewer = "builtin", @@ -323,13 +298,7 @@ M.globals.tags = { file_icons = true and M._has_devicons, git_icons = true, color_icons = true, - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.btags = { previewer = function() return M.globals.default_previewer end, @@ -338,13 +307,7 @@ M.globals.btags = { file_icons = true and M._has_devicons, git_icons = true, color_icons = true, - actions = { - ["default"] = actions.file_edit, - ["ctrl-s"] = actions.file_split, - ["ctrl-v"] = actions.file_vsplit, - ["ctrl-t"] = actions.file_tabedit, - ["ctrl-q"] = actions.file_sel_to_qf, - }, + actions = M.globals.files.actions, } M.globals.colorschemes = { prompt = 'Colorschemes> ',