clone of my dotfiles.ssp.sh
update git behaviour and fix jumping to next diff with ]c [c
+19
-8
+1
-1
nvim/.config/nvim/lazy-lock.json
+1
-1
nvim/.config/nvim/lazy-lock.json
···
24
24
"fzf": { "branch": "master", "commit": "55193ee4dc379d643e91a21b34b75745b90e6aa0" },
25
25
"fzf.vim": { "branch": "master", "commit": "34a564c81f36047f50e593c1656f4580ff75ccca" },
26
26
"github-nvim-theme": { "branch": "main", "commit": "8db454eb272eabb349209ec62ceb63b8eea5f011" },
27
+
"gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
27
28
"gruvbox-material": { "branch": "master", "commit": "30e9f4b0fa24c25980df1690a8c47c36e40b6673" },
28
29
"gruvbox.nvim": { "branch": "main", "commit": "561126520034a1dac2f78ab063db025d12555998" },
29
30
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
···
87
88
"vim-jinja2-syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
88
89
"vim-lastplace": { "branch": "master", "commit": "e58cb0df716d3c88605ae49db5c4741db8b48aa9" },
89
90
"vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
90
-
"vim-signify": { "branch": "master", "commit": "9ec7989ef5f92c5073de26abb46fc6a998b75ef8" },
91
91
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
92
92
"vim-system-copy": { "branch": "master", "commit": "f007ef29e559a6017d96bea42fcc5f43af792284" },
93
93
"vim-textobj-python": { "branch": "master", "commit": "06de233e805b6bcfd0fde7591c64cf927637feb7" },
+3
-6
nvim/.config/nvim/lua/sspaeti/plugins/_init_lazy.lua
+3
-6
nvim/.config/nvim/lua/sspaeti/plugins/_init_lazy.lua
···
65
65
config = function()
66
66
require("diffview").setup({
67
67
hooks = {
68
-
hooks = {
69
-
diff_buf_win_enter = function(bufnr)
70
-
vim.cmd("norm! gg]c")
71
-
end,
72
-
},
73
68
diff_buf_read = function(bufnr)
74
-
-- print("Opening diff buffer...")
75
69
vim.cmd("norm! gg]c")
76
70
if vim.fn.search("]c") ~= 0 then
77
71
vim.cmd("norm! zz")
···
79
73
end,
80
74
diff_buf_win_enter = function(bufnr)
81
75
vim.opt_local.foldlevel = 99
76
+
-- Restore default ]c / [c diff navigation (overridden by signify/markdown plugins)
77
+
vim.keymap.set("n", "]c", "]c", { buffer = bufnr, desc = "Next diff change" })
78
+
vim.keymap.set("n", "[c", "[c", { buffer = bufnr, desc = "Previous diff change" })
82
79
end,
83
80
},
84
81
})
+15
-1
nvim/.config/nvim/lua/sspaeti/plugins/git.lua
+15
-1
nvim/.config/nvim/lua/sspaeti/plugins/git.lua
···
1
1
return {
2
-
{ "mhinz/vim-signify", event = "VeryLazy" }, --highlighing changes not commited to last commmit
2
+
{
3
+
"lewis6991/gitsigns.nvim",
4
+
event = "VeryLazy",
5
+
opts = {
6
+
on_attach = function(bufnr)
7
+
local gs = require("gitsigns")
8
+
local map = function(mode, l, r, desc)
9
+
vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc })
10
+
end
11
+
map("n", "]h", gs.next_hunk, "Next git hunk")
12
+
map("n", "[h", gs.prev_hunk, "Previous git hunk")
13
+
map("n", "<leader>gd", function() gs.blame_line({ full = true }) end, "Git blame line")
14
+
end,
15
+
},
16
+
},
3
17
{ "APZelos/blamer.nvim", event = "VeryLazy" }, --gitlens blame style',
4
18
{
5
19
"FabijanZulj/blame.nvim",