who even knows

home-manager/shared/programs/shell/default.nix

@@ -13,6 +13,7 @@
       bat
       ripgrep
       fd
+      jq
     ];
   };
   programs.fish = {
@@ -61,11 +62,11 @@
       ":q" = "exit";
       hms = "home-manager switch --flake $NIX_FLAKE#${host.username}";
       rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}";
-      nvim-dev = "nix run ~/dev/nvim.nix";
       mpv = "mpv --no-keepaspect-window";
       cat = "bat -pp";
       tcd = "cd $(mktemp -d)";
       docker = "nerdctl";
+      vimdiff = "nvim -d";
     };
   };
   programs.bash = {

home-manager/shared/programs/shell/git.nix

@@ -37,10 +37,15 @@
       ui = {
         pager = "${pkgs.bat}/bin/bat";
         default-command = ["log"];
+        conflict-marker-style = "git";
+        merge-editor = "vimdiff";
       };
       snapshot = {
         max-new-file-size = "10MiB";
       };
+      git = {
+        subprocess = true;
+      };
     };
   };
 }