comparison .chezmoitemplates/init.lua @ 517:0ed17680bf08

Use callback hook to disable dirvish maps when merging
author zegervdv <zegervdv@me.com>
date Fri, 31 Dec 2021 12:47:12 +0100
parents cf71ce0b06d3
children 784b931c51b7
comparison
equal deleted inserted replaced
516:cf71ce0b06d3 517:0ed17680bf08
82 use { 82 use {
83 'zegervdv/merge.nvim', 83 'zegervdv/merge.nvim',
84 opt = true, 84 opt = true,
85 cmd = { 'MergeInit' }, 85 cmd = { 'MergeInit' },
86 config = function() 86 config = function()
87 require('merge').setup { wrap = true } 87 require('merge').setup {
88 wrap = true,
89 pre_hook = function()
90 -- disable dirvish
91 vim.api.nvim_del_keymap('n', '-')
92 end,
93 }
88 end, 94 end,
89 } 95 }
90 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } 96 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } }
91 97
92 -- Comments 98 -- Comments