diff --git a/git/default.nix b/git/default.nix
index 183cddd..4ed8da1 100644
--- a/git/default.nix
+++ b/git/default.nix
@@ -44,7 +44,8 @@
         merge.ff = false;
         merge.tool = "nvim";
 
-        mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
+        mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'";
+        mergetool.nvim.trustExitCode = false;
         mergetool.prompt = false;
 
         pager.difftool = true;
diff --git a/neovim/default.nix b/neovim/default.nix
index f213b6b..1b7f2a5 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -55,6 +55,7 @@
         vim-flog
         git-blame-nvim
         nvim-web-devicons # used by diffview-nvim
+        diffview-nvim
 
         # snippets
         friendly-snippets
@@ -175,6 +176,14 @@
         require("local_firenvim")
 
         require("CopilotChat").setup()
+        require("diffview").setup({
+          view = {
+            merge_tool = {
+              layout = "diff4_mixed",
+              disable_diagnostics = true,
+            }
+          }
+        })
       '';
     };
   };