diff --git a/lua/config/options.lua b/lua/config/options.lua
index 7a1de72..1aa6a1e 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -136,3 +136,8 @@ vim.g.completion_borders   = "rounded" ---@type string Options: [round|sharp|fla
 --  ━━━━━━━━━━━━━━━━━━━━━━━━ Post-Config Functions ━━━━━━━━━━━━━━━━━━━━━━━━
 -- Setup blinky cursor
 require("utils.blinky").setup(vim.g.blinky)
+
+-- Setup nvim-remote
+if vim.fn.executable("nvr") == 1 then
+  vim.env.GIT_EDITOR = "nvr -cc split --remote-wait +'set bufhidden=wipe'"
+end