Commit 512f2af9e867

Vincent Demeester <vincent@sbr.pm>
2026-02-05 16:58:30
feat(kitty,nvim): add delta diff viewer and diffview.nvim
Updated kitty git diff popup to use delta with side-by-side view. Added diffview.nvim plugin to neovim for interactive git diff browsing. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
main
1 parent 2e76161
Changed files (2)
dots
config
nvim
lua
plugins
extras.lua
home
common
desktop
kitty.nix
dots/config/nvim/lua/plugins/extras.lua
@@ -94,4 +94,16 @@ return {
     "m-demare/hlargs.nvim",
     config = true,
   },
+
+  -- Diffview for git diffs
+  {
+    "sindrets/diffview.nvim",
+    cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" },
+    keys = {
+      { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Diffview Open" },
+      { "<leader>gq", "<cmd>DiffviewClose<cr>", desc = "Diffview Close" },
+      { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File History" },
+      { "<leader>gH", "<cmd>DiffviewFileHistory<cr>", desc = "Branch History" },
+    },
+  },
 }
home/common/desktop/kitty.nix
@@ -112,8 +112,8 @@
       # LazyGit popup - full-featured git UI
       map kitty_mod+g launch --type=overlay --title="  LazyGit" --cwd=current zsh -i -c lazygit
 
-      # Git diff popup - quick diff viewer
-      map ctrl+alt+r launch --type=overlay --title="  Git Diff" --cwd=current zsh -i -c 'git diff 2>/dev/null; git diff --staged 2>/dev/null'
+      # Git diff popup - delta side-by-side diff viewer
+      map ctrl+alt+r launch --type=overlay --title="  Git Diff" --cwd=current zsh -i -c 'git diff --staged 2>/dev/null | delta -s; git diff 2>/dev/null | delta -s; echo "Press q to exit"; read'
     '';
   };