59 lines
1.6 KiB
Lua
Executable File
59 lines
1.6 KiB
Lua
Executable File
-- You can add your own plugins here or in other files in this directory!
|
|
-- I promise not to create any merge conflicts in this directory :)
|
|
--
|
|
-- See the kickstart.nvim README for more information
|
|
return {
|
|
{
|
|
'ThePrimeagen/harpoon',
|
|
branch = 'harpoon2',
|
|
dependencies = { 'nvim-lua/plenary.nvim' },
|
|
},
|
|
{
|
|
'ThePrimeagen/vim-be-good',
|
|
},
|
|
{
|
|
'mbbill/undotree',
|
|
|
|
config = function()
|
|
vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
|
|
end,
|
|
},
|
|
{
|
|
'tpope/vim-fugitive',
|
|
config = function()
|
|
vim.keymap.set('n', '<leader>gs', vim.cmd.Git)
|
|
|
|
local ThePrimeagen_Fugitive = vim.api.nvim_create_augroup('ThePrimeagen_Fugitive', {})
|
|
|
|
local autocmd = vim.api.nvim_create_autocmd
|
|
autocmd('BufWinEnter', {
|
|
group = ThePrimeagen_Fugitive,
|
|
pattern = '*',
|
|
callback = function()
|
|
if vim.bo.ft ~= 'fugitive' then
|
|
return
|
|
end
|
|
|
|
local bufnr = vim.api.nvim_get_current_buf()
|
|
local opts = { buffer = bufnr, remap = false }
|
|
vim.keymap.set('n', '<leader>p', function()
|
|
vim.cmd.Git 'push'
|
|
end, opts)
|
|
|
|
-- rebase always
|
|
vim.keymap.set('n', '<leader>P', function()
|
|
vim.cmd.Git { 'pull', '--rebase' }
|
|
end, opts)
|
|
|
|
-- NOTE: It allows me to easily set the branch i am pushing and any tracking
|
|
-- needed if i did not set the branch up correctly
|
|
vim.keymap.set('n', '<leader>t', ':Git push -u origin ', opts)
|
|
end,
|
|
})
|
|
|
|
vim.keymap.set('n', 'gu', '<cmd>diffget //2<CR>')
|
|
vim.keymap.set('n', 'gh', '<cmd>diffget //3<CR>')
|
|
end,
|
|
},
|
|
}
|