added git stuff to neovim config
This commit is contained in:
parent
86fcbcbfbb
commit
6a3c29ef39
4 changed files with 50 additions and 2 deletions
24
homes/modules/programs/neovim/lua/plugins/git.lua
Normal file
24
homes/modules/programs/neovim/lua/plugins/git.lua
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
return {
|
||||
{
|
||||
"vim-fugitive",
|
||||
for_cat = "git",
|
||||
cmd = { "Git", "Gvdiffsplit" },
|
||||
},
|
||||
{
|
||||
"resolve-nvim",
|
||||
for_cat = "git",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
after = function(plugin)
|
||||
require("resolve").setup({
|
||||
default_keymaps = false,
|
||||
on_conflicts_resolved = function(info)
|
||||
-- NOTE: am not sure if i wanna stage files automatically
|
||||
-- local filepath = vim.api.nvim_buf_get_name(info.bufnr)
|
||||
-- vim.fn.system({ "git", "add", filepath })
|
||||
-- vim.notify("conflicts resolved :3 file staged yayayayy <3", vim.log.levels.INFO)
|
||||
vim.notify("conflicts resolved :3", vim.log.levels.INFO)
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
@ -6,4 +6,5 @@ require("lze").load({
|
|||
{ import = "plugins.mini-hipatterns" },
|
||||
{ import = "plugins.format" },
|
||||
{ import = "plugins.comment" },
|
||||
{ import = "plugins.git" },
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue