diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 7e23b4a..4edf173 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,8 +6,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
-  "fzf": { "branch": "master", "commit": "c30e486b648c1540a660802a5015aeca208274fa" },
-  "fzf.vim": { "branch": "master", "commit": "45d96c9cb1213204479593236dfabf911ff15443" },
+  "fzf-lua": { "branch": "main", "commit": "faf585f8cdc2b9fd633f9f9fd3c5df2de27567d7" },
   "gitsigns.nvim": { "branch": "main", "commit": "a4db718c78bff65198e3b63f1043f1e7bb5e05c8" },
   "harpoon": { "branch": "harpoon2", "commit": "4ad05be8fe98092f0dec3bc3b47abebb59c3814a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index 82a8371..ac8dd24 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -5,7 +5,7 @@ local keymaps = {
     ["<Leader>"] = {
         b = {
             name = "buffer",
-            b = { "<Cmd>Buffers<CR>", "Switch buffer" },
+            b = { "<Cmd>FzfLua buffers<CR>", "Switch buffer" },
             n = { "<Cmd>bnext<CR>", "Next buffer" },
             p = { "<Cmd>bprevious<CR>", "Previous buffer" },
             d = { function() require("mini.bufremove").delete(0) end, "Delete buffer" },
@@ -13,8 +13,8 @@ local keymaps = {
         },
         f = {
             name = "find",
-            f = { "<Cmd>Files<CR>", "Find file" },
-            g = { "<Cmd>GitFiles<CR>", "Find git file" },
+            f = { "<Cmd>FzfLua files<CR>", "Find file" },
+            g = { "<Cmd>FzfLua git_files<CR>", "Find git file" },
             s = { "<Cmd>update<CR>", "Save" },
         },
         p = {
@@ -36,9 +36,9 @@ local keymaps = {
         },
         s = {
             name = "search",
-            l = { "<Cmd>Lines<CR>", "Search lines in current file" },
-            p = { "<Cmd>Rg<CR>", "Search project (fuzzy)" },
-            P = { "<Cmd>RG<CR>", "Search project (exact)" },
+            l = { "<Cmd>FzfLua blines<CR>", "Search lines in current file" },
+            p = { "<Cmd>FzfLua grep_project<CR>", "Search project (fuzzy)" },
+            P = { "<Cmd>FzfLua live_grep<CR>", "Search project (exact)" },
         },
         g = {
             name = "git",
@@ -79,7 +79,7 @@ local keymaps = {
 }
 
 -- Aliases
-keymaps["<Leader>"]["<Leader>"] = keymaps["<Leader>"].f.g
+keymaps["<Leader>"]["<Leader>"] = keymaps["<Leader>"].f.f
 keymaps["<Leader>"]["/"] = keymaps["<Leader>"].s.p
 keymaps["<Leader>"]["?"] = keymaps["<Leader>"].s.P
 keymaps["<Leader>"][","] = keymaps["<Leader>"].b.b
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index cb3b18d..f61db32 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -55,16 +55,17 @@ return require("lazy").setup({
 
     -- {{{ Search
     {
-        "https://github.com/junegunn/fzf.vim",
+        "https://github.com/ibhagwan/fzf-lua",
         event = "VeryLazy",
-        dependencies = {
-            "https://github.com/junegunn/fzf",
-        },
         config = function()
-            vim.g.fzf_buffers_jump = 1
-            vim.g.fzf_layout = {
-                down = '~50%',
-            }
+            require("fzf-lua").setup({
+                "max-perf",
+                winopts = {
+                    height = 0.5,
+                    width = 1,
+                    row = 1,
+                },
+            })
         end,
     },
     -- }}}
@@ -86,11 +87,6 @@ return require("lazy").setup({
                 win_options = {
                     concealcursor = "nvic",
                 },
-                keymaps = {
-                    ["<Leader><Leader>"] = function()
-                        vim.cmd("Files! " .. oil.get_current_dir())
-                    end,
-                },
             })
         end,
     },