diff options
| -rw-r--r-- | .config/nvim/lua/custom/git.lua | 81 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/git.lua | 96 |
2 files changed, 87 insertions, 90 deletions
diff --git a/.config/nvim/lua/custom/git.lua b/.config/nvim/lua/custom/git.lua deleted file mode 100644 index 5e1664e..0000000 --- a/.config/nvim/lua/custom/git.lua +++ /dev/null @@ -1,81 +0,0 @@ -local set = vim.keymap.set -local gitsigns = require('gitsigns') -gitsigns.setup() -require('neogit').setup({ - mappings = { - commit_editor = { - ['<C-y>'] = 'Submit', - ['<C-n>'] = 'Abort', - }, - commit_editor_I = { - ['<C-y>'] = 'Submit', - ['<C-n>'] = 'Abort', - }, - popup = { - ['p'] = 'PushPopup', -- P for push - ['P'] = 'PullPopup', -- shift P for Pull - }, - }, -}) -require('octo').setup({ - suppress_missing_scope = { projects_v2 = true }, -}) -local quit_keymap = { 'n', 'q', '<cmd>DiffviewClose<cr>', { desc = 'Quit the diffview' } } -require('diffview').setup({ - enhanced_diff_hl = true, - default = { winbar_info = true }, - keymaps = { - view = { quit_keymap }, - file_panel = { quit_keymap }, - file_history_panel = { quit_keymap }, - }, -}) - --- Add support for markdown in octo.nvim -vim.treesitter.language.register('markdown', 'octo') - --- Autocomplete for @ (user mention) and # (issue) --- Works in GitHub issues/PRs (for octo.nvim) -vim.api.nvim_create_autocmd('FileType', { - pattern = 'octo', - callback = function() - vim.keymap.set('i', '@', '@<C-x><C-o>', { silent = true, buffer = true }) - vim.keymap.set('i', '#', '#<C-x><C-o>', { silent = true, buffer = true }) - end, -}) - --- GitHub keymaps -set('n', '<leader>gi', '<cmd>Octo issue search<cr>', { desc = '[G]ithub [I]ssues (local)' }) -set('n', '<leader>pr', '<cmd>Octo pr search<cr>', { desc = 'Github [PR]s (local)' }) -set('n', '<leader>gI', '<cmd>Octo search is:issue is:open author:@me<cr>', { desc = '[G]ithub [I]ssues (global)' }) -set('n', '<leader>pR', '<cmd>Octo search is:pr author:@me<cr>', { desc = 'Github [PR]s (global)' }) - --- Git keymaps -set('n', '<leader>gB', gitsigns.toggle_current_line_blame, { desc = '[G]it [B]lame Line' }) -set('n', '<leader>gD', gitsigns.toggle_deleted, { desc = '[G]it [D]eleted' }) -set('n', '<leader>gb', '<cmd>Neogit branch<cr>', { desc = '[G]it [B]ranch' }) -set('n', '<leader>gd', '<cmd>DiffviewOpen<cr>', { desc = '[G]it [D]iff' }) -set('n', '<leader>gl', '<cmd>DiffviewFileHistory<cr>', { desc = '[G]it [L]og (diffview)' }) -set('n', '<leader>gL', '<cmd>Neogit log<cr>', { desc = '[G]it [L]og (neogit)' }) -set('n', '<leader>gs', '<cmd>Neogit<cr>', { desc = '[G]it [S]tatus' }) -set('n', '<leader>gc', '<cmd>Neogit commit<cr>', { desc = '[G]it [C]ommit' }) -set('n', '<leader>gp', '<cmd>Neogit push<cr>', { desc = '[G]it [P]ush' }) -set('n', '<leader>gP', '<cmd>Neogit pull<cr>', { desc = '[G]it [P]ull' }) -set('n', '<leader>gr', '<cmd>Neogit rebase<cr>', { desc = '[G]it [R]ebase' }) -set('n', '<leader>gm', '<cmd>Neogit merge<cr>', { desc = '[G]it [M]erge' }) - --- Hunk Keymaps -local function stage_visual_chunk() - gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) -end -local function reset_visual_chunk() - gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') }) -end -set('n', '<leader>hp', gitsigns.preview_hunk, { desc = '[H]unk [P]review' }) -set('n', '<leader>hs', gitsigns.stage_hunk, { desc = '[H]unk [S]tage' }) -set('n', '<leader>hr', gitsigns.reset_hunk, { desc = '[H]unk [R]eset' }) -set('v', '<leader>hs', stage_visual_chunk, { desc = '[H]unk [S]tage' }) -set('v', '<leader>hr', reset_visual_chunk, { desc = '[H]unk [S]tage' }) -set('n', '<leader>hS', gitsigns.stage_buffer, { desc = '[S]tage Buffer' }) -set('n', '<leader>hR', gitsigns.reset_buffer, { desc = '[R]eset Buffer' }) -set('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = '[H]unk [U]ndo' }) diff --git a/.config/nvim/lua/custom/plugins/git.lua b/.config/nvim/lua/custom/plugins/git.lua index d770405..3c75969 100644 --- a/.config/nvim/lua/custom/plugins/git.lua +++ b/.config/nvim/lua/custom/plugins/git.lua @@ -1,13 +1,91 @@ +local quit_keymap = { 'n', 'q', '<cmd>DiffviewClose<cr>', { desc = 'Quit the diffview' } } +local diffview_opts = { + enhanced_diff_hl = true, + default = { winbar_info = true }, + keymaps = { + view = { quit_keymap }, + file_panel = { quit_keymap }, + file_history_panel = { quit_keymap }, + }, +} + +local neogit_opts = { + mappings = { + commit_editor = { + ['<C-y>'] = 'Submit', + ['<C-n>'] = 'Abort', + }, + commit_editor_I = { + ['<C-y>'] = 'Submit', + ['<C-n>'] = 'Abort', + }, + popup = { + ['p'] = 'PushPopup', + ['P'] = 'PullPopup', + }, + }, +} + +local function octo_config() + require('octo').setup({ suppress_missing_scope = { projects_v2 = true } }) + + vim.treesitter.language.register('markdown', 'octo') + vim.api.nvim_create_autocmd('FileType', { + pattern = 'octo', + callback = function() + -- Autocomplete for @ (user mention) and # (issue) + vim.keymap.set('i', '@', '@<C-x><C-o>', { silent = true, buffer = true }) + vim.keymap.set('i', '#', '#<C-x><C-o>', { silent = true, buffer = true }) + end, + }) +end + +-- Helpers +local function stage_visual_chunk() + require('gitsigns').stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) +end +local function reset_visual_chunk() + require('gitsigns').reset_hunk({ vim.fn.line('.'), vim.fn.line('v') }) +end + +-- GitHub Keymaps +local search_open_issues_by_me = '<cmd>Octo search is:issue is:open author:@me<cr>' +vim.keymap.set('n', '<leader>gi', '<cmd>Octo issue search<cr>', { desc = '[G]ithub [I]ssues (local)' }) +vim.keymap.set('n', '<leader>pr', '<cmd>Octo pr search<cr>', { desc = 'Github [PR]s (local)' }) +vim.keymap.set('n', '<leader>gI', search_open_issues_by_me, { desc = '[G]ithub [I]ssues (global)' }) +vim.keymap.set('n', '<leader>pR', '<cmd>Octo search is:pr author:@me<cr>', { desc = 'Github [PR]s (global)' }) + +-- Git keymaps +vim.keymap.set('n', '<leader>gB', '<cmd>Gitsigns toggle_current_line_blame<cr>', { desc = '[G]it [B]lame Line' }) +vim.keymap.set('n', '<leader>gD', '<cmd>Gitsigns toggle_deleted<cr>', { desc = '[G]it [D]eleted' }) +vim.keymap.set('n', '<leader>gb', '<cmd>Neogit branch<cr>', { desc = '[G]it [B]ranch' }) +vim.keymap.set('n', '<leader>gd', '<cmd>DiffviewOpen<cr>', { desc = '[G]it [D]iff' }) +vim.keymap.set('n', '<leader>gl', '<cmd>DiffviewFileHistory<cr>', { desc = '[G]it [L]og (diffview)' }) +vim.keymap.set('n', '<leader>gs', '<cmd>Neogit<cr>', { desc = '[G]it [S]tatus' }) +vim.keymap.set('n', '<leader>gL', '<cmd>Neogit log<cr>', { desc = '[G]it [L]og (neogit)' }) +vim.keymap.set('n', '<leader>gc', '<cmd>Neogit commit<cr>', { desc = '[G]it [C]ommit' }) +vim.keymap.set('n', '<leader>gp', '<cmd>Neogit push<cr>', { desc = '[G]it [P]ush' }) +vim.keymap.set('n', '<leader>gP', '<cmd>Neogit pull<cr>', { desc = '[G]it [P]ull' }) +vim.keymap.set('n', '<leader>gr', '<cmd>Neogit rebase<cr>', { desc = '[G]it [R]ebase' }) +vim.keymap.set('n', '<leader>gm', '<cmd>Neogit merge<cr>', { desc = '[G]it [M]erge' }) + +-- Hunk Keymaps +vim.keymap.set('n', '<leader>hp', '<cmd>Gitsigns preview_hunk<cr>', { desc = '[H]unk [P]review' }) +vim.keymap.set('n', '<leader>hs', '<cmd>Gitsigns stage_hunk<cr>', { desc = '[H]unk [S]tage' }) +vim.keymap.set('n', '<leader>hr', '<cmd>Gitsigns reset_hunk<cr>', { desc = '[H]unk [R]eset' }) +vim.keymap.set('v', '<leader>hs', stage_visual_chunk, { desc = '[H]unk [S]tage' }) +vim.keymap.set('v', '<leader>hr', reset_visual_chunk, { desc = '[H]unk [S]tage' }) +vim.keymap.set('n', '<leader>hS', '<cmd>Gitsigns stage_buffer<cr>', { desc = '[S]tage Buffer' }) +vim.keymap.set('n', '<leader>hR', '<cmd>Gitsigns reset_buffer<cr>', { desc = '[R]eset Buffer' }) +vim.keymap.set('n', '<leader>hu', '<cmd>Gitsigns undo_stage_hunk<cr>', { desc = '[H]unk [U]ndo' }) + return { - 'NeogitOrg/neogit', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-telescope/telescope.nvim', + { 'NeogitOrg/neogit', opts = neogit_opts, cmd = 'Neogit' }, + { 'lewis6991/gitsigns.nvim', config = true }, + { 'pwntester/octo.nvim', config = octo_config, cmd = 'Octo' }, + { 'sindrets/diffview.nvim', - 'lewis6991/gitsigns.nvim', - 'pwntester/octo.nvim', + opts = diffview_opts, + cmd = { 'DiffviewOpen', 'DiffviewClose', 'DiffviewFileHistory' }, }, - config = function() - require('custom.git') - end, } |