From c71d6ae982320e00750629706ccc907cec26865e Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 18 Sep 2026 02:43:20 +0200 Subject: [PATCH] improve mini.diff --- nvim/.config/nvim/README.md | 18 ++++++++++-------- nvim/.config/nvim/lua/romanzy/keymaps.lua | 3 +++ nvim/.config/nvim/lua/romanzy/plugins/mini.lua | 15 +++++++++------ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/nvim/.config/nvim/README.md b/nvim/.config/nvim/README.md index 05de16c..d663a5e 100644 --- a/nvim/.config/nvim/README.md +++ b/nvim/.config/nvim/README.md @@ -45,12 +45,8 @@ Git shortcuts: - `lg` open LazyGit - `dv` open Diffview - `dc` close Diffview - -Toggle shortcuts: - -- `tw` toggle soft wrap -- `ti` toggle inline diagnostics -- `tv` toggle virtual diagnostics +- `[h`, `]h`, `[H`, `]H` jump to hunks +- `th` — toggle the expanded hunk view Refresh shortcuts (oil and buffers): @@ -66,6 +62,13 @@ Oil usage: - `` previews the selected entry - `gx` opens the file in external viewer +Toggle shortcuts: + +- `tw` toggle soft wrap +- `ti` toggle inline diagnostics +- `tv` toggle virtual diagnostics +- `th` — toggle the expanded hunk view + ## Terminal Two options to leave terminal mode and return to normal mode: @@ -102,8 +105,7 @@ Diagnostics: - `g.` open diagnostic float - `gl` send diagnostics to the location list - `gld` display diagnostic information -- `]g` jump to next warning or error -- `[g` jump to previous warning or error +- `]g`, `[g` jump to warning or error - `ti` toggle inline diagnostics - `tv` toggle virtual diagnostics - `xx` toggle project warnings and errors diff --git a/nvim/.config/nvim/lua/romanzy/keymaps.lua b/nvim/.config/nvim/lua/romanzy/keymaps.lua index 377d3a9..fd064f4 100644 --- a/nvim/.config/nvim/lua/romanzy/keymaps.lua +++ b/nvim/.config/nvim/lua/romanzy/keymaps.lua @@ -29,6 +29,9 @@ map("n", "lg", "LazyGit", { desc = "open lazygit" }) map("n", "dv", "DiffviewOpen", { desc = "open diffview" }) map("n", "dc", "DiffviewClose", { desc = "close diffview" }) map("n", "tw", require("romanzy.custom.wrap").toggle, { desc = "toggle soft wrap" }) +map("n", "th", function() + MiniDiff.toggle_overlay() +end, { desc = "toggle hunk view" }) map("n", "sv", "vs", { desc = "split vertical" }) map("n", "sh", "sp", { desc = "split horizontal" }) diff --git a/nvim/.config/nvim/lua/romanzy/plugins/mini.lua b/nvim/.config/nvim/lua/romanzy/plugins/mini.lua index a6fc336..ca152d3 100644 --- a/nvim/.config/nvim/lua/romanzy/plugins/mini.lua +++ b/nvim/.config/nvim/lua/romanzy/plugins/mini.lua @@ -46,12 +46,15 @@ git.setup({}) diff.setup({}) local function set_mini_diff_highlights() - vim.api.nvim_set_hl(0, "MiniDiffSignAdd", { fg = "#9ccf8d" }) - vim.api.nvim_set_hl(0, "MiniDiffSignChange", { fg = "#f6c177" }) - vim.api.nvim_set_hl(0, "MiniDiffSignDelete", { fg = "#eb6f92" }) - vim.api.nvim_set_hl(0, "MiniDiffOverAdd", { fg = "#9ccf8d" }) - vim.api.nvim_set_hl(0, "MiniDiffOverChange", { fg = "#f6c177" }) - vim.api.nvim_set_hl(0, "MiniDiffOverDelete", { fg = "#eb6f92" }) + vim.api.nvim_set_hl(0, "MiniDiffSignAdd", { fg = "#9ccf8d", bold = true }) + vim.api.nvim_set_hl(0, "MiniDiffSignChange", { fg = "#f6c177", bold = true }) + vim.api.nvim_set_hl(0, "MiniDiffSignDelete", { fg = "#eb6f92", bold = true }) + vim.api.nvim_set_hl(0, "MiniDiffOverAdd", { fg = "#9ccf8d", bg = "#333c48", bold = true }) + vim.api.nvim_set_hl(0, "MiniDiffOverChange", { fg = "#eb6f92", bg = "#43293a", bold = true }) + 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 set_mini_diff_highlights() vim.api.nvim_create_autocmd("ColorScheme", {