kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes to the keybinds for the diffview plugin in nvim, as well as adding neovim as default merge tool for git

Browse source
This commit is contained in:
Sergio Laín 2023-09-10 01:08:24 +02:00
parent 0bf3eb84ba
commit df4855cadb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.config/nvim/lua/plugins/diffview.lua
View file

@ -3,8 +3,9 @@ return {
"sindrets/diffview.nvim", "sindrets/diffview.nvim",
cmd = { "DiffviewOpen", "DiffviewFileHistory" }, cmd = { "DiffviewOpen", "DiffviewFileHistory" },
keys = { keys = {
{ "<Leader>gd", "<cmd>DiffviewFileHistory<CR>", desc = "Diff File" }, { "<Leader>gdd", "<cmd>DiffviewFileHistory<CR>", desc = "Diff File History" },
{ "<Leader>gv", "<cmd>DiffviewOpen<CR>", desc = "Diff View" }, { "<Leader>gdo", "<cmd>DiffviewOpen<CR>", desc = "Open Diff View" },
{ "<Leader>gdc", "<cmd>DiffviewClose<CR>", desc = "Close Diff View" },
}, },
event = "BufRead", event = "BufRead",
config = function() config = function()

1
.config/nvim/lua/plugins/which-key.lua
View file

@ -24,6 +24,7 @@ return {
["<leader>x"] = { name = "+diagnostics/quickfix" }, ["<leader>x"] = { name = "+diagnostics/quickfix" },
["<leader>cc"] = { name = "+compile" }, ["<leader>cc"] = { name = "+compile" },
["<leader>cp"] = { name = "+packages" }, ["<leader>cp"] = { name = "+packages" },
["<leader>gd"] = { name = "+diff" },
}, },
}, },
config = function(_, opts) config = function(_, opts)

1
.gitconfig
View file

@ -23,6 +23,7 @@
[interactive] [interactive]
diffFilter = diff-so-fancy --patch diffFilter = diff-so-fancy --patch
[merge] [merge]
tool = nvim
conflictstyle = diff3 conflictstyle = diff3
[pager] [pager]
blame = diff-so-fancy | less --tabs=4 -RFX blame = diff-so-fancy | less --tabs=4 -RFX