diff options
| author | Kyren223 <kyren223@proton.me> | 2025-07-30 18:27:42 +0300 |
|---|---|---|
| committer | Kyren223 <kyren223@proton.me> | 2025-07-30 18:27:42 +0300 |
| commit | 1717641ed2840cf9b349abeeac7fd91eb5b833ed (patch) | |
| tree | 4f54fe8acf145055be0aaef901cab352e8f975e2 | |
| parent | 2c232cec9112b82bc0587d0136f8862ba7dbba2d (diff) | |
Added conflict highlighting in nvim
| -rw-r--r-- | .config/nvim/lazy-lock.json | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/conflict-marker.lua | 17 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/render-markdown.lua | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 41b9177..d48049b 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -9,6 +9,7 @@ "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" }, "colorful-menu.nvim": { "branch": "master", "commit": "bc3e82609f2fcf7dad7ca87c20e65e51d5d9d87c" }, + "conflict-marker.nvim": { "branch": "master", "commit": "4cf4f0460d0726cd720a836409dc454f50de8e9e" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "gitsigns.nvim": { "branch": "main", "commit": "1fcaddcc427ff5802b6602f46de37a5352d0f9e0" }, diff --git a/.config/nvim/lua/plugins/conflict-marker.lua b/.config/nvim/lua/plugins/conflict-marker.lua new file mode 100644 index 0000000..c85f472 --- /dev/null +++ b/.config/nvim/lua/plugins/conflict-marker.lua @@ -0,0 +1,17 @@ +return { + 'tronikelis/conflict-marker.nvim', + opts = { + on_attach = function(conflict) + local MID = '^=======$' + + vim.keymap.set('n', '<leader>M', function() + vim.cmd('?' .. MID) + end, { buffer = conflict.bufnr }) + + vim.keymap.set('n', '<leader>m', function() + vim.cmd('/' .. MID) + end, { buffer = conflict.bufnr }) + end, + }, + event = { 'BufReadPre', 'BufNewFile' }, +} diff --git a/.config/nvim/lua/plugins/render-markdown.lua b/.config/nvim/lua/plugins/render-markdown.lua index a7ae2b7..4cc79ba 100644 --- a/.config/nvim/lua/plugins/render-markdown.lua +++ b/.config/nvim/lua/plugins/render-markdown.lua @@ -2,7 +2,7 @@ return { 'MeanderingProgrammer/render-markdown.nvim', event = { 'BufReadPre', 'BufNewFile' }, keys = { - { '<leader>mt', '<<cmd>RenderMarkdown toggle<cr>'} + -- { '<leader>mt', '<<cmd>RenderMarkdown toggle<cr>'} }, opts = { render_modes = true, |