From f8b447dbbd7ca5b46ded2fd26f0bf9c94cce352e Mon Sep 17 00:00:00 2001 From: bhagwan Date: Sun, 12 Dec 2021 10:36:54 -0800 Subject: [PATCH] remove 'nvim-fzf' depedency --- README.md | 7 ++----- doc/fzf-lua.txt | 13 +++++-------- lua/fzf-lua/shell.lua | 11 +---------- lua/fzf-lua/shell_helper.lua | 2 +- minimal_init.lua | 1 - 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index f95bc50..39afff8 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ at it. That, **and colorful file icons and git indicators!**. - [`neovim`](https://github.com/neovim/neovim/releases) version > 0.5.0 - [`fzf`](https://github.com/junegunn/fzf) or [`skim`](https://github.com/lotabout/skim) binary installed -- [nvim-fzf](https://github.com/vijaymarupudi/nvim-fzf) - [nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons) (optional) @@ -70,7 +69,6 @@ Using [vim-plug](https://github.com/junegunn/vim-plug) ```vim Plug 'ibhagwan/fzf-lua' -Plug 'vijaymarupudi/nvim-fzf' Plug 'kyazdani42/nvim-web-devicons' ``` @@ -78,9 +76,8 @@ Using [packer.nvim](https://github.com/wbthomason/packer.nvim) ```lua use { 'ibhagwan/fzf-lua', - requires = { - 'vijaymarupudi/nvim-fzf', - 'kyazdani42/nvim-web-devicons' } -- optional for icons + -- optional for icon support + requires = { 'kyazdani42/nvim-web-devicons' } } ``` > **Note:** if you already have fzf installed you do not need to install `fzf` diff --git a/doc/fzf-lua.txt b/doc/fzf-lua.txt index be35650..f33858e 100644 --- a/doc/fzf-lua.txt +++ b/doc/fzf-lua.txt @@ -63,7 +63,6 @@ DEPENDENCIES *fzf-lua-dependencies* - `neovim` version > 0.5.0 - `fzf` or `skim` binary installed -- nvim-fzf - nvim-web-devicons (optional) @@ -85,16 +84,14 @@ Using vim-plug > Plug 'ibhagwan/fzf-lua' - Plug 'vijaymarupudi/nvim-fzf' Plug 'kyazdani42/nvim-web-devicons' < Using packer.nvim > use { 'ibhagwan/fzf-lua', - requires = { - 'vijaymarupudi/nvim-fzf', - 'kyazdani42/nvim-web-devicons' } -- optional for icons + -- optional for icon support + requires = { 'kyazdani42/nvim-web-devicons' } } < Note: if you already have fzf installed you do not need to install fzf or @@ -414,7 +411,7 @@ Consult the list below for available settings: files = { -- previewer = "cat", -- uncomment to override previewer prompt = 'Files❯ ', - multiprocess = true, -- run command in a separator process + multiprocess = true, -- run command in a separate process git_icons = true, -- show git icons? file_icons = true, -- show file icons? color_icons = true, -- colorize file|git icons @@ -445,7 +442,7 @@ Consult the list below for available settings: git = { files = { prompt = 'GitFiles❯ ', - multiprocess = false, -- run command in a separator process + multiprocess = false, -- run command in a separate process cmd = 'git ls-files --exclude-standard', git_icons = true, -- show git icons? file_icons = true, -- show file icons? @@ -499,7 +496,7 @@ Consult the list below for available settings: grep = { prompt = 'Rg❯ ', input_prompt = 'Grep For❯ ', - multiprocess = true, -- run command in a separator process + multiprocess = true, -- run command in a separate process git_icons = true, -- show git icons? file_icons = true, -- show file icons? color_icons = true, -- colorize file|git icons diff --git a/lua/fzf-lua/shell.lua b/lua/fzf-lua/shell.lua index 3526af0..13b0c8c 100644 --- a/lua/fzf-lua/shell.lua +++ b/lua/fzf-lua/shell.lua @@ -1,4 +1,4 @@ --- for testing, copied from: +-- modified version of: -- https://github.com/vijaymarupudi/nvim-fzf/blob/master/lua/fzf/actions.lua local uv = vim.loop local path = require "fzf-lua.path" @@ -97,15 +97,6 @@ function M.action(fn, fzf_field_expression) return vim.fn.shellescape(action_string), id end --- set to 'true' to use 'nvim-fzf' --- set to 'false' for debugging using the local version -if false then - M.action = require("fzf.actions").action - M.raw_action = require("fzf.actions").raw_action - M.async_action = require("fzf.actions").async_action - M.raw_async_action = require("fzf.actions").raw_async_action -end - M.preview_action_cmd = function(fn, fzf_field_expression) return M.async_action(function(pipe, ...) diff --git a/lua/fzf-lua/shell_helper.lua b/lua/fzf-lua/shell_helper.lua index 34653d3..cd2a400 100644 --- a/lua/fzf-lua/shell_helper.lua +++ b/lua/fzf-lua/shell_helper.lua @@ -1,4 +1,4 @@ --- for testing, copied from: +-- modified version of: -- https://github.com/vijaymarupudi/nvim-fzf/blob/master/action_helper.lua local uv = vim.loop diff --git a/minimal_init.lua b/minimal_init.lua index 077c85f..1a3d984 100644 --- a/minimal_init.lua +++ b/minimal_init.lua @@ -34,7 +34,6 @@ end packer.startup({function(use) use { 'wbthomason/packer.nvim', opt = true } use { 'ibhagwan/fzf-lua', - requires = { 'vijaymarupudi/nvim-fzf' }, config = function() vim.api.nvim_set_keymap('n', '', ':lua require"fzf-lua".files()', {})