diff --git a/.config/git/config b/.config/git/config
index 8faee5d..239c49a 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -52,7 +52,7 @@
 [difftool "nvim"]
   cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
 [mergetool "nvim"]
-  cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
+  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 # }}}
 
 # {{{ VSCode
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 214edff..9688331 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -56,6 +56,11 @@ local plugins = {
     
     -- Git integration
     {"git", "gitsigns.nvim", "https://github.com/lewis6991/gitsigns.nvim.git"},
+    {"git", "vim-fugitive", "https://github.com/tpope/vim-fugitive.git"},
+
+    -- Tools
+    {"db", "vim-dadbod", "https://github.com/tpope/vim-dadbod.git"},
+    {"env", "dotenv", "https://github.com/tpope/vim-dotenv"},
     
     -- Quality of life
     {"editor", "which-key.nvim", "https://github.com/folke/which-key.nvim.git"},