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 /.config/nvim/lua/plugins | |
| parent | 2c232cec9112b82bc0587d0136f8862ba7dbba2d (diff) | |
Added conflict highlighting in nvim
Diffstat (limited to '.config/nvim/lua/plugins')
| -rw-r--r-- | .config/nvim/lua/plugins/conflict-marker.lua | 17 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/render-markdown.lua | 2 |
2 files changed, 18 insertions, 1 deletions
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, |