Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

nvim: Add hunk.nvim as jj difftool

Browse source
This commit is contained in:
Marty Oehme 2025-02-07 21:51:03 +01:00
parent d724d75bf7
commit 36232855cc
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nvim/.config/nvim/lazy-lock.json
View file

@ -23,6 +23,7 @@
"glance.nvim": { "branch": "master", "commit": "1a08824835d7582457b67acbe23ca33487912a5e" },
"grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
"helpview.nvim": { "branch": "main", "commit": "aca211993d7dd82bc03e7650bae859a570ba27d6" },
"hunk.nvim": { "branch": "master", "commit": "eb89245a66bdfce10436d15923bf4deb43d23c96" },
"image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },

11
nvim/.config/nvim/lua/plugins/git.lua
View file

@ -1,4 +1,15 @@
return {
{
"julienvincent/hunk.nvim",
dependencies = {
"MunifTanjim/nui.nvim",
{ "nvim-tree/nvim-web-devicons", optional = true },
},
cmd = { "DiffEditor" },
config = function()
require("hunk").setup()
end,
},
{
"akinsho/git-conflict.nvim",
event = { "InsertEnter", "CursorHold", "VeryLazy" },