improve mini.diff

This commit is contained in:
2026-09-18 02:43:20 +02:00
parent 7c24bf6c94
commit c71d6ae982
3 changed files with 22 additions and 14 deletions
+10 -8
View File
@@ -45,12 +45,8 @@ Git shortcuts:
- `<leader>lg` open LazyGit - `<leader>lg` open LazyGit
- `<leader>dv` open Diffview - `<leader>dv` open Diffview
- `<leader>dc` close Diffview - `<leader>dc` close Diffview
- `[h`, `]h`, `[H`, `]H` jump to hunks
Toggle shortcuts: - `<leader>th` — toggle the expanded hunk view
- `<leader>tw` toggle soft wrap
- `<leader>ti` toggle inline diagnostics
- `<leader>tv` toggle virtual diagnostics
Refresh shortcuts (oil and buffers): Refresh shortcuts (oil and buffers):
@@ -66,6 +62,13 @@ Oil usage:
- `<C-p>` previews the selected entry - `<C-p>` previews the selected entry
- `gx` opens the file in external viewer - `gx` opens the file in external viewer
Toggle shortcuts:
- `<leader>tw` toggle soft wrap
- `<leader>ti` toggle inline diagnostics
- `<leader>tv` toggle virtual diagnostics
- `<leader>th` — toggle the expanded hunk view
## Terminal ## Terminal
Two options to leave terminal mode and return to normal mode: Two options to leave terminal mode and return to normal mode:
@@ -102,8 +105,7 @@ Diagnostics:
- `g.` open diagnostic float - `g.` open diagnostic float
- `gl` send diagnostics to the location list - `gl` send diagnostics to the location list
- `gld` display diagnostic information - `gld` display diagnostic information
- `]g` jump to next warning or error - `]g`, `[g` jump to warning or error
- `[g` jump to previous warning or error
- `<leader>ti` toggle inline diagnostics - `<leader>ti` toggle inline diagnostics
- `<leader>tv` toggle virtual diagnostics - `<leader>tv` toggle virtual diagnostics
- `<leader>xx` toggle project warnings and errors - `<leader>xx` toggle project warnings and errors
@@ -29,6 +29,9 @@ map("n", "<leader>lg", "<Cmd>LazyGit<CR>", { desc = "open lazygit" })
map("n", "<leader>dv", "<Cmd>DiffviewOpen<CR>", { desc = "open diffview" }) map("n", "<leader>dv", "<Cmd>DiffviewOpen<CR>", { desc = "open diffview" })
map("n", "<leader>dc", "<Cmd>DiffviewClose<CR>", { desc = "close diffview" }) map("n", "<leader>dc", "<Cmd>DiffviewClose<CR>", { desc = "close diffview" })
map("n", "<leader>tw", require("romanzy.custom.wrap").toggle, { desc = "toggle soft wrap" }) map("n", "<leader>tw", require("romanzy.custom.wrap").toggle, { desc = "toggle soft wrap" })
map("n", "<leader>th", function()
MiniDiff.toggle_overlay()
end, { desc = "toggle hunk view" })
map("n", "<leader>sv", "<Cmd>vs<CR>", { desc = "split vertical" }) map("n", "<leader>sv", "<Cmd>vs<CR>", { desc = "split vertical" })
map("n", "<leader>sh", "<Cmd>sp<CR>", { desc = "split horizontal" }) map("n", "<leader>sh", "<Cmd>sp<CR>", { desc = "split horizontal" })
@@ -46,12 +46,15 @@ git.setup({})
diff.setup({}) diff.setup({})
local function set_mini_diff_highlights() local function set_mini_diff_highlights()
vim.api.nvim_set_hl(0, "MiniDiffSignAdd", { fg = "#9ccf8d" }) vim.api.nvim_set_hl(0, "MiniDiffSignAdd", { fg = "#9ccf8d", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffSignChange", { fg = "#f6c177" }) vim.api.nvim_set_hl(0, "MiniDiffSignChange", { fg = "#f6c177", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffSignDelete", { fg = "#eb6f92" }) vim.api.nvim_set_hl(0, "MiniDiffSignDelete", { fg = "#eb6f92", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffOverAdd", { fg = "#9ccf8d" }) vim.api.nvim_set_hl(0, "MiniDiffOverAdd", { fg = "#9ccf8d", bg = "#333c48", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffOverChange", { fg = "#f6c177" }) vim.api.nvim_set_hl(0, "MiniDiffOverChange", { fg = "#eb6f92", bg = "#43293a", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffOverDelete", { fg = "#eb6f92" }) vim.api.nvim_set_hl(0, "MiniDiffOverChangeBuf", { fg = "#9ccf8d", bg = "#333c48", bold = true })
vim.api.nvim_set_hl(0, "MiniDiffOverContext", { fg = "#908caa", bg = "#26233a" })
vim.api.nvim_set_hl(0, "MiniDiffOverContextBuf", { fg = "#e0def4", bg = "#1f1d2e" })
vim.api.nvim_set_hl(0, "MiniDiffOverDelete", { fg = "#eb6f92", bg = "#43293a", bold = true })
end end
set_mini_diff_highlights() set_mini_diff_highlights()
vim.api.nvim_create_autocmd("ColorScheme", { vim.api.nvim_create_autocmd("ColorScheme", {