feat(nvim): unified fuzzy searching

4 files changed, 33 insertions, 12 deletions

diff --git a/.config/nvim/lua/keybind.lua b/.config/nvim/lua/keybind.lua
index 28b8171..d1e3840 100644
--- a/.config/nvim/lua/keybind.lua
+++ b/.config/nvim/lua/keybind.lua
@@ -19,11 +19,13 @@ else
     vim.api.nvim_set_keymap("n", "<C-j>", ":lua navigate_d_nvim() <CR>", { noremap = true, silent = true })
 end
 
-vim.api.nvim_set_keymap("n", "<Leader>f", ":Files<CR>",   { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>b", ":Buffers<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>l", ":Lines<CR>",   { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>w", ":BLines<CR>",  { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>m", ":Marks<CR>",   { noremap = true, silent = true })
+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>|", ":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 38bf17b..d0a293b 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -148,3 +148,27 @@ vim.g.tex_flavor     = "latex"
 
 -- headers are c
 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"]      = { "fg", "Comment" },
+          ["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/lua/theme.lua b/.config/nvim/lua/theme.lua
index a584cfa..c3a1806 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -179,9 +179,3 @@ vim.g.terminal_color_12 = "#9dc2ba"
 vim.g.terminal_color_13 = "#e1acbb"
 vim.g.terminal_color_14 = "#a7c7a2"
 vim.g.terminal_color_15 = "#e2d3ba"
-
-vim.g.fzf_colors = {
-    ["fg"]      = {'fg', 'NormalFloat'},
-    ["bg"]      = {'bg', 'NormalFloat'},
-    ["fg+"]     = {'bg', 'StatusLine'},
-}
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 5b668a4..127bedc 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -8,7 +8,8 @@ nvim-treesitter/nvim-treesitter
 TimUntersberger/neogit
 lewis6991/gitsigns.nvim
 
-junegunn/fzf.vim
+ibhagwan/fzf-lua
+vijaymarupudi/nvim-fzf
 junegunn/vim-easy-align
 
 tpope/vim-surround