fix(nvim): fzf-lua changes buffer color

3 files changed, 22 insertions, 38 deletions

diff --git a/.config/nvim/lua/keybind.lua b/.config/nvim/lua/keybind.lua
index a89f358..1a0d5b5 100644
--- a/.config/nvim/lua/keybind.lua
+++ b/.config/nvim/lua/keybind.lua
@@ -19,15 +19,12 @@ else
     vim.api.nvim_set_keymap("n", "<C-j>", ":lua navigate_d_nvim() <CR>", { noremap = true, silent = true })
 end
 
-function fzf(command) return ":lua require('fzf-lua')." .. command .. "()<CR>" end
-
-vim.api.nvim_set_keymap("n", "<Leader>ff",  fzf("files"),   { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>fb",  fzf("buffers"), { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>fl",  fzf("lines"),   { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>fw",  fzf("blines"),  { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>fm",  fzf("marks"),   { noremap = true, silent = true })
-
-vim.api.nvim_set_keymap("n", "<Leader>gf",  fzf("grep"),    { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>ff",  ":Files <CR>",   { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>fb",  ":Buffers <CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>fl",  ":Lines <CR>",   { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>fw",  ":BLines <CR>",  { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>fm",  ":Marks <CR>",   { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>fa",  ":Ag <CR>",      { noremap = true, silent = true })
 
 vim.api.nvim_set_keymap("n", "<Leader>|", ":wincmd |<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader>=", ":wincmd =<CR>", { noremap = true, silent = true })
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 8d29048..7af2282 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -150,30 +150,18 @@ vim.g.tex_flavor     = "latex"
 vim.g.c_syntax_for_h = 1
 
 -- fzf
-local fzf = require("fzf-lua")
-fzf.setup({
-    winopts = {
-        hl_normal = "NormalFloat",
-        hl_border = "StatusLineNc",
-    },
-    fzf_colors = {
-          ["fg"]      = { "fg", "CursorLine" },
-          ["bg"]      = { "bg", "NormalFloat" },
-          ["hl"]      = { "bg", "IncSearch" },
-          ["fg+"]     = { "fg", "NormalFloat" },
-          ["bg+"]     = { "bg", "Normal" },
-          ["hl+"]     = { "fg", "Statement" },
-          ["info"]    = { "fg", "PreProc" },
-          ["prompt"]  = { "fg", "Conditional" },
-          ["pointer"] = { "fg", "Exception" },
-          ["marker"]  = { "fg", "Keyword" },
-          ["spinner"] = { "fg", "Label" },
-          ["header"]  = { "fg", "String" },
-          ["gutter"]  = { "bg", "NormalFloat" },
-  },
-  files = {
-      cmd = "fd -I",
-  },
-})
-local win = require("fzf-lua.win")
-win.set_autoclose(true)
+vim.g.fzf_colors = {
+      ["fg"]      = { "fg", "CursorLine" },
+      ["bg"]      = { "bg", "NormalFloat" },
+      ["hl"]      = { "bg", "IncSearch" },
+      ["fg+"]     = { "fg", "NormalFloat" },
+      ["bg+"]     = { "bg", "Normal" },
+      ["hl+"]     = { "fg", "Statement" },
+      ["info"]    = { "fg", "PreProc" },
+      ["prompt"]  = { "fg", "Conditional" },
+      ["pointer"] = { "fg", "Exception" },
+      ["marker"]  = { "fg", "Keyword" },
+      ["spinner"] = { "fg", "Label" },
+      ["header"]  = { "fg", "String" },
+      ["gutter"]  = { "bg", "NormalFloat" },
+}
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 127bedc..5b668a4 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -8,8 +8,7 @@ nvim-treesitter/nvim-treesitter
 TimUntersberger/neogit
 lewis6991/gitsigns.nvim
 
-ibhagwan/fzf-lua
-vijaymarupudi/nvim-fzf
+junegunn/fzf.vim
 junegunn/vim-easy-align
 
 tpope/vim-surround