diff --git a/lua/fzf-lua/core.lua b/lua/fzf-lua/core.lua index 2673f55..fb1c7f2 100644 --- a/lua/fzf-lua/core.lua +++ b/lua/fzf-lua/core.lua @@ -50,7 +50,7 @@ M.build_fzf_cli = function(opts) [[ --preview-window='%s%s' --preview=%s]] .. [[ --expect=%s --ansi --info=inline]] .. [[ %s %s]], - cfg.fzf_layout, + opts.fzf_layout or cfg.fzf_layout, utils._if(opts.fzf_binds, opts.fzf_binds, vim.fn.shellescape(table.concat(cfg.fzf_binds, ','))), vim.fn.shellescape(opts.prompt), @@ -168,7 +168,8 @@ M.fzf_files = function(opts) end local selected = fzf.fzf(opts.fzf_fn, - M.build_fzf_cli(opts), config.winopts(opts.winopts)) + M.build_fzf_cli(opts), + config.winopts(opts.winopts)) if not selected then return end diff --git a/lua/fzf-lua/providers/buffers.lua b/lua/fzf-lua/providers/buffers.lua index 75a4fab..c507b95 100644 --- a/lua/fzf-lua/providers/buffers.lua +++ b/lua/fzf-lua/providers/buffers.lua @@ -122,14 +122,14 @@ M.buffers = function(opts) table.insert(items, item_str) end + opts.preview = act + opts.cli_args = utils._if( + header_line and not opts.ignore_current_buffer, + '--header-lines=1', '' + ) + local selected = require("fzf").fzf(items, - core.build_fzf_cli({ - prompt = opts.prompt, - preview = act, - actions = opts.actions, - cli_args = utils._if(header_line and not opts.ignore_current_buffer, - '--header-lines=1', '') - }), + core.build_fzf_cli(opts), config.winopts(opts)) if not selected then return end diff --git a/lua/fzf-lua/providers/colorschemes.lua b/lua/fzf-lua/providers/colorschemes.lua index c7729cd..5cecd4d 100644 --- a/lua/fzf-lua/providers/colorschemes.lua +++ b/lua/fzf-lua/providers/colorschemes.lua @@ -36,13 +36,13 @@ M.colorschemes = function(opts) local current_colorscheme = get_current_colorscheme() local current_background = vim.o.background local colors = vim.list_extend(opts.colors or {}, vim.fn.getcompletion('', 'color')) + + opts.preview = prev_act + opts.preview_window = opts.preview_window or 'right:0' + opts.nomulti = utils._if(opts.nomulti~=nil, opts.nomulti, true) + local selected = fzf.fzf(colors, - core.build_fzf_cli({ - prompt = opts.prompt, - preview = prev_act, preview_window = 'right:0', - actions = opts.actions, - nomulti = true, - }), + core.build_fzf_cli(opts), config.winopts(opts.winopts)) if not selected then diff --git a/lua/fzf-lua/providers/helptags.lua b/lua/fzf-lua/providers/helptags.lua index fea6224..6fd6241 100644 --- a/lua/fzf-lua/providers/helptags.lua +++ b/lua/fzf-lua/providers/helptags.lua @@ -103,15 +103,12 @@ M.helptags = function(opts) -- local prev_act = action(function (args) end) + opts.cli_args = opts.cli_args or "--nth 1" + opts.preview_window = opts.preview_window or 'right:0' + opts.nomulti = utils._if(opts.nomulti~=nil, opts.nomulti, true) + local selected = fzf.fzf(fzf_function, - core.build_fzf_cli({ - prompt = opts.prompt, - -- preview = prev_act, - preview_window = 'right:0', - actions = opts.actions, - cli_args = "--nth 1", - nomulti = true, - }), + core.build_fzf_cli(opts), config.winopts(opts.winopts)) if not selected then return end diff --git a/lua/fzf-lua/providers/manpages.lua b/lua/fzf-lua/providers/manpages.lua index 3f546e4..9d4df71 100644 --- a/lua/fzf-lua/providers/manpages.lua +++ b/lua/fzf-lua/providers/manpages.lua @@ -34,15 +34,12 @@ M.manpages = function(opts) utils.ansi_codes.red(man), desc) end) + opts.cli_args = opts.cli_args or "--tiebreak begin --nth 1,2" + opts.preview_window = opts.preview_window or 'right:0' + opts.nomulti = utils._if(opts.nomulti~=nil, opts.nomulti, true) + local selected = fzf.fzf(fzf_fn, - core.build_fzf_cli({ - prompt = opts.prompt, - -- preview = prev_act, - preview_window = 'right:0', - actions = opts.actions, - cli_args = "--tiebreak begin --nth 1,2", - nomulti = true, - }), + core.build_fzf_cli(opts), config.winopts(opts.winopts)) if not selected then return end