Customize git mergetool

home/features/cli/git.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   #Prefer IPv4 for ssh
   # home.file.".ssh/config".text = "AddressFamily inet";
 
@@ -13,6 +13,13 @@
       user.signingkey = "0x2C2C1C62A5388E82";
       init.defaultBranch = "main";
       pull.rebase = false; # merge by default
+      merge.tool = "nvim";
+      mergetool = {
+        nvim = {
+          cmd = "nvim -c 'DiffviewOpen'";
+        };
+        prompt = false;
+      };
     };
     lfs.enable = true;
     aliases = {

home/features/coding/nixvim/plugins.nix

@@ -43,6 +43,7 @@
     barbar.enable = true;
     rainbow-delimiters.enable = true;
     web-devicons.enable = true;
+	 diffview.enable = true;
 
     telescope = {
       enable = true;