diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 5baf7e4..11ba0cf 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -7,9 +7,10 @@
   "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
   "fzf-lua": { "branch": "main", "commit": "6865ff44f975c21d84a0206edae82e5cbb0fd80e" },
   "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "grug-far.nvim": { "branch": "main", "commit": "58250566b4abb0595d55e2d2bcd8f18dfd17e819" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" },
+  "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
   "leap.nvim": { "branch": "main", "commit": "f1f19fc268b406b00b50091f51f16d9634fbe449" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "e00dcf8a6019a88139626c1668dccdc295abd324" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index d41883e..eed283a 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -39,6 +39,8 @@ local keymaps = {
             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 (regex)" },
+            r = { function() require("grug-far").grug_far({}) end, "Search and replace" },
+            R = { function() require("grug-far").grug_far({ prefills = { flags = vim.fn.expand("%") } }) end, "Search and replace in current file" },
         },
         g = {
             name = "git",
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 6ad4ab1..6813457 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -68,6 +68,14 @@ return require("lazy").setup({
             })
         end,
     },
+
+    {
+        "https://github.com/MagicDuck/grug-far.nvim",
+        lazy = true,
+        config = function()
+            require("grug-far").setup({})
+        end,
+    },
     -- }}}
 
     -- {{{ File manager