Mercurial > dotfiles
comparison .chezmoitemplates/init.lua @ 733:1a7ec1a0d2a6
feat: enable chg binary for diffview
author | zegervdv <zegervdv@me.com> |
---|---|
date | Sat, 17 Dec 2022 15:52:27 +0100 |
parents | 18a9b8ccddc3 |
children | 485de5dc7ef2 |
comparison
equal
deleted
inserted
replaced
732:18a9b8ccddc3 | 733:1a7ec1a0d2a6 |
---|---|
109 use { | 109 use { |
110 local_plugin 'diffview.nvim', | 110 local_plugin 'diffview.nvim', |
111 config = function() | 111 config = function() |
112 require('diffview').setup { | 112 require('diffview').setup { |
113 use_icons = false, | 113 use_icons = false, |
114 hg_cmd = { 'chg' }, | |
114 view = { | 115 view = { |
115 merge_tool = { | 116 merge_tool = { |
116 layout = 'diff4_mixed', | 117 layout = 'diff4_mixed', |
117 }, | 118 }, |
118 }, | 119 }, |
119 } | 120 } |
120 local wk = require 'which-key' | 121 local wk = require 'which-key' |
121 wk.register { ['<leader>d'] = { name = 'Diffview' } } | 122 wk.register { ['<leader>d'] = { name = 'Diffview' } } |
122 vim.keymap.set('n', '<leader>do', '<cmd>DiffviewOpen<CR>', { desc = 'Open Diffview' }) | 123 vim.keymap.set('n', '<leader>do', '<cmd>DiffviewOpen<CR>', { desc = 'Open Diffview' }) |
123 vim.keymap.set('n', '<leader>df', '<cmd>DiffviewFileHistory %<CR>', { desc = 'Show history for current file' }) | 124 vim.keymap.set('n', '<leader>df', '<cmd>DiffviewFileHistory %<CR>', { desc = 'Show history for current file' }) |
124 vim.keymap.set('n', '<leader>dh', '<cmd>DiffviewFileHistory ', { desc = 'Show history' }) | 125 vim.keymap.set('n', '<leader>dh', '<esc>DiffviewFileHistory ', { desc = 'Show history' }) |
125 vim.keymap.set('n', '<leader>dc', '<cmd>DiffviewClose<CR>', { desc = 'Close Diffview window' }) | 126 vim.keymap.set('n', '<leader>dc', '<cmd>DiffviewClose<CR>', { desc = 'Close Diffview window' }) |
126 end, | 127 end, |
127 } | 128 } |
128 | 129 |
129 -- Comments | 130 -- Comments |