From 67b7444ac31a635ed8b66998d70aae7dfa8af10a Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Tue, 16 Apr 2024 12:25:52 -0700
Subject: [PATCH] Add fzf-lua

---
 .gitmodules                |  3 +++
 lua/config/plugins.lua     | 22 +++++++---------------
 pack/plugins/start/fzf-lua |  1 +
 3 files changed, 11 insertions(+), 15 deletions(-)
 create mode 160000 pack/plugins/start/fzf-lua

diff --git a/.gitmodules b/.gitmodules
index 0f86105..afb7d0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,6 @@
 [submodule "pack/plugins/start/vim-jdaddy"]
 	path = pack/plugins/start/vim-jdaddy
 	url = https://github.com/tpope/vim-jdaddy.git
+[submodule "pack/plugins/start/fzf-lua"]
+	path = pack/plugins/start/fzf-lua
+	url = https://github.com/ibhagwan/fzf-lua.git
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index c3103e6..000050b 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -1,22 +1,14 @@
 -- comment.nvim
 require('Comment').setup()
 
--- fzf.vim
+-- fzf-lua
 if vim.fn.executable('fzf') == 1 then
-    vim.cmd([[
-        command! -bang -nargs=* Fs
-        \ call fzf#vim#grep(
-        \   'git grep --line-number -- '.shellescape(<q-args>), 0,
-        \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
-    ]])
-
-    vim.keymap.set('n', '<leader>fg', vim.cmd.GFiles)
-    vim.keymap.set('n', '<leader>fs', vim.cmd.Fs)
-    vim.keymap.set('n', '<leader>fh', vim.cmd.History)
-    vim.keymap.set('n', '<leader>fb', vim.cmd.Buffers)
-    vim.keymap.set('n', '<leader>fl', vim.cmd.Lines)
-
-    vim.fn.setenv('BAT_THEME', 'Nord')
+    vim.keymap.set('n', '<leader>fb', require('fzf-lua').buffers)
+    vim.keymap.set('n', '<leader>fg', require('fzf-lua').git_files)
+    vim.keymap.set('n', '<leader>fh', require('fzf-lua').oldfiles)
+    vim.keymap.set('n', '<leader>fl', require('fzf-lua').lines)
+    vim.keymap.set('n', '<leader>fp', require('fzf-lua').grep)
+    vim.keymap.set('n', '<leader>fs', require('fzf-lua').live_grep_native)
 end
 
 -- guid.nvim
diff --git a/pack/plugins/start/fzf-lua b/pack/plugins/start/fzf-lua
new file mode 160000
index 0000000..743647f
--- /dev/null
+++ b/pack/plugins/start/fzf-lua
@@ -0,0 +1 @@
+Subproject commit 743647f639a83e41e283d2d7daa03a85e1fbf951