From ff13fce3739ef8c09d08a48b058363d2f7fb6c11 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Tue, 9 Jul 2024 22:33:50 +0300 Subject: Neovim: almost finished with git integration, did minor unrelated tweaks --- .config/nvim/lua/custom/git.lua | 62 +++++++++++++++++++++++ .config/nvim/lua/custom/plugins/TODO-git.lua | 32 ++++-------- .config/nvim/lua/custom/plugins/TODO-overseer.lua | 2 +- .config/nvim/lua/custom/plugins/motions.lua | 8 +-- .config/nvim/lua/custom/plugins/neotree.lua | 2 +- .config/nvim/lua/custom/plugins/todo-comments.lua | 4 +- .config/nvim/lua/custom/plugins/ui.lua | 6 +-- .config/nvim/lua/custom/plugins/utility.lua | 9 ++-- .config/nvim/lua/custom/telescope.lua | 1 + 9 files changed, 86 insertions(+), 40 deletions(-) create mode 100644 .config/nvim/lua/custom/git.lua (limited to '.config/nvim/lua/custom') diff --git a/.config/nvim/lua/custom/git.lua b/.config/nvim/lua/custom/git.lua new file mode 100644 index 0000000..b30deb5 --- /dev/null +++ b/.config/nvim/lua/custom/git.lua @@ -0,0 +1,62 @@ +local set = vim.keymap.set +local gitsigns = require('gitsigns') +gitsigns.setup() +require('neogit').setup({}) +require('octo').setup() +require('diffview').setup({ + enhanced_diff_hl = true, + default = { winbar_info = true }, + keymaps = { + view = { + { 'n', 'q', 'DiffviewClose', { desc = 'Quit the diffview' } }, + }, + file_panel = { + { 'n', 'q', 'DiffviewClose', { desc = 'Quit the diffview' } }, + }, + file_history_panel = { + { 'n', 'q', 'DiffviewClose', { desc = 'Quit the diffview' } }, + }, + }, +}) + +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', '@', '@', { silent = true, buffer = true }) + vim.keymap.set('i', '#', '#', { silent = true, buffer = true }) + end, +}) + +-- GitHub keymaps +set('n', 'gi', 'Octo issue search', { desc = '[G]ithub [I]ssues' }) +set('n', 'pr', 'Octo issue search', { desc = 'Github [PR]s' }) + +-- Git keymaps +set('n', 'gb', gitsigns.toggle_current_line_blame, { desc = '[G]it [B]lame Line' }) +set('n', 'gD', gitsigns.toggle_deleted, { desc = '[G]it [D]eleted' }) +set('n', 'gd', 'DiffviewOpen', { desc = '[G]it [D]iff' }) +set('n', 'gl', 'DiffviewFileHistory', { desc = '[G]it [L]og' }) +set('n', 'gs', 'Neogit', { desc = '[G]it [S]tatus' }) +set('n', 'ga', 'TODO:', { desc = '[G]it [A]dd' }) +set('n', 'gc', 'TODO:', { desc = '[G]it [C]ommit' }) +set('n', 'gp', 'TODO:', { desc = '[G]it [P]ush' }) +set('n', 'gP', 'TODO:', { desc = '[G]it [P]ull' }) + +-- 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', 'hp', gitsigns.preview_hunk, { desc = '[H]unk [P]review' }) +set('n', 'hs', gitsigns.stage_hunk, { desc = '[H]unk [S]tage' }) +set('n', 'hr', gitsigns.reset_hunk, { desc = '[H]unk [R]eset' }) +set('v', 'hs', stage_visual_chunk, { desc = '[H]unk [S]tage' }) +set('v', 'hr', reset_visual_chunk, { desc = '[H]unk [S]tage' }) +set('n', 'hS', gitsigns.stage_buffer, { desc = '[S]tage Buffer' }) +set('n', 'hR', gitsigns.reset_buffer, { desc = '[R]eset Buffer' }) +set('n', 'hu', gitsigns.undo_stage_hunk, { desc = '[H]unk [U]ndo' }) diff --git a/.config/nvim/lua/custom/plugins/TODO-git.lua b/.config/nvim/lua/custom/plugins/TODO-git.lua index bd022b9..565d19c 100644 --- a/.config/nvim/lua/custom/plugins/TODO-git.lua +++ b/.config/nvim/lua/custom/plugins/TODO-git.lua @@ -1,28 +1,14 @@ return { - { + 'NeogitOrg/neogit', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-telescope/telescope.nvim', + 'sindrets/diffview.nvim', + 'tpope/vim-fugitive', 'lewis6991/gitsigns.nvim', - config = function() - require('gitsigns').setup() - vim.keymap.set('n', 'gp', ':Gitsigns preview_hunk', { desc = '[G]it [P]review' }) - vim.keymap.set('n', 'gb', ':Gitsigns toggle_current_line_blame', { desc = '[G]it [B]lame' }) - end, - }, - { 'tpope/vim-fugitive' }, - { 'sindrets/diffview.nvim' }, - { 'pwntester/octo.nvim', - config = function() - require('octo').setup() - vim.treesitter.language.register('markdown', 'octo') - - vim.api.nvim_create_autocmd('FileType', { - pattern = 'octo', - callback = function() - vim.keymap.set('i', '@', '@', { silent = true, buffer = true }) - vim.keymap.set('i', '#', '#', { silent = true, buffer = true }) - end, - }) - vim.keymap.set('n', 'gi', ':Octo issue search', { desc = '[G]thub [I]ssues' }) - end, }, + config = function() + require('custom.git') + end, } diff --git a/.config/nvim/lua/custom/plugins/TODO-overseer.lua b/.config/nvim/lua/custom/plugins/TODO-overseer.lua index 6362f2a..a597f51 100644 --- a/.config/nvim/lua/custom/plugins/TODO-overseer.lua +++ b/.config/nvim/lua/custom/plugins/TODO-overseer.lua @@ -5,6 +5,6 @@ return { require('overseer').setup({ templates = { 'builtin', 'user.c_build_make' }, }) - vim.keymap.set('n', 'r', ':OverseerRun', { desc = '[R]un Task' }) + vim.keymap.set('n', 'r', 'OverseerRun', { desc = '[R]un Task' }) end, } diff --git a/.config/nvim/lua/custom/plugins/motions.lua b/.config/nvim/lua/custom/plugins/motions.lua index 71abb97..b06981c 100644 --- a/.config/nvim/lua/custom/plugins/motions.lua +++ b/.config/nvim/lua/custom/plugins/motions.lua @@ -2,10 +2,10 @@ return { { 'christoomey/vim-tmux-navigator', config = function() - vim.keymap.set('n', 'C-h', ':TmuxNavigatorLeft') - vim.keymap.set('n', 'C-j', ':TmuxNavigatorDown') - vim.keymap.set('n', 'C-k', ':TmuxNavigatorUp') - vim.keymap.set('n', 'C-l', ':TmuxNavigatorRight') + vim.keymap.set('n', 'C-h', 'TmuxNavigatorLeft') + vim.keymap.set('n', 'C-j', 'TmuxNavigatorDown') + vim.keymap.set('n', 'C-k', 'TmuxNavigatorUp') + vim.keymap.set('n', 'C-l', 'TmuxNavigatorRight') end, }, { diff --git a/.config/nvim/lua/custom/plugins/neotree.lua b/.config/nvim/lua/custom/plugins/neotree.lua index b8a4ee9..661ab40 100644 --- a/.config/nvim/lua/custom/plugins/neotree.lua +++ b/.config/nvim/lua/custom/plugins/neotree.lua @@ -10,6 +10,6 @@ return { open_files_do_not_replace_types = { 'terminal', 'Trouble', 'qf', 'edgy' }, }, config = function() - vim.keymap.set('n', 'nt', ':Neotree toggle reveal left', { desc = '[N]eotree [T]oggle' }) + vim.keymap.set('n', 'nt', 'Neotree toggle reveal left', { desc = '[N]eotree [T]oggle' }) end, } diff --git a/.config/nvim/lua/custom/plugins/todo-comments.lua b/.config/nvim/lua/custom/plugins/todo-comments.lua index a404874..6d8b58f 100644 --- a/.config/nvim/lua/custom/plugins/todo-comments.lua +++ b/.config/nvim/lua/custom/plugins/todo-comments.lua @@ -88,7 +88,7 @@ return { -- pattern = [[\b(KEYWORDS)\b]], }, }) - vim.keymap.set('n', 'st', ':TodoTelescope keywords=TODO,FIX', { desc = '[S]earch [T]odos' }) - vim.keymap.set('n', 'lt', ':TodoTrouble', { desc = '[L]ist [T]odos' }) + vim.keymap.set('n', 'st', 'TodoTelescope keywords=TODO,FIX', { desc = '[S]earch [T]odos' }) + vim.keymap.set('n', 'lt', 'TodoTrouble', { desc = '[L]ist [T]odos' }) end, } diff --git a/.config/nvim/lua/custom/plugins/ui.lua b/.config/nvim/lua/custom/plugins/ui.lua index 052be12..e5f06f9 100644 --- a/.config/nvim/lua/custom/plugins/ui.lua +++ b/.config/nvim/lua/custom/plugins/ui.lua @@ -16,14 +16,14 @@ return { auto_enable = true, }, }) - vim.keymap.set('n', 'cp', ':CccPick', { desc = '[C]olor [P]icker' }) - vim.keymap.set('n', 'ct', ':CccHighlighterToggle', { desc = '[C]olor [T]oggle' }) + vim.keymap.set('n', 'cp', '', { desc = '[C]olor [P]icker' }) + vim.keymap.set('n', 'ct', 'CccHighlighterToggle', { desc = '[C]olor [T]oggle' }) end, }, { 'RRethy/vim-illuminate', config = function() - vim.keymap.set('n', 'it', ':IlluminateToggle', { desc = '[I]lluminate [Tloggle]' }) + vim.keymap.set('n', 'it', 'IlluminateToggle', { desc = '[I]lluminate [Tloggle]' }) end, }, { diff --git a/.config/nvim/lua/custom/plugins/utility.lua b/.config/nvim/lua/custom/plugins/utility.lua index 79eac83..4951f05 100644 --- a/.config/nvim/lua/custom/plugins/utility.lua +++ b/.config/nvim/lua/custom/plugins/utility.lua @@ -11,10 +11,7 @@ return { vim.keymap.set('n', '', session.search_session, { desc = '[S]ession Manager' }) end, }, - { - 'wakatime/vim-wakatime', - lazy = false, - }, + { 'wakatime/vim-wakatime', lazy = false }, { 'AckslD/nvim-neoclip.lua', dependencies = { @@ -34,7 +31,7 @@ return { }, }) -- NOTE: Using `plus` to set the plus register to the selected value - vim.keymap.set('n', 'nc', ':Telescope neoclip plus', { desc = '[N]eo[c]lip History' }) + vim.keymap.set('n', 'nc', 'Telescope neoclip plus', { desc = '[N]eo[c]lip History' }) end, }, { @@ -54,5 +51,5 @@ return { -- NOTE: No keybindings, use `:Spectre` or `:Spectre ` -- Spectre has no undo, so it should be rarely used, -- which is why no keybindings are defined - { 'nvim-pack/nvim-spectre', }, + { 'nvim-pack/nvim-spectre' }, } diff --git a/.config/nvim/lua/custom/telescope.lua b/.config/nvim/lua/custom/telescope.lua index bb6ec62..2be1c78 100644 --- a/.config/nvim/lua/custom/telescope.lua +++ b/.config/nvim/lua/custom/telescope.lua @@ -43,6 +43,7 @@ vim.keymap.set('n', 'ps', builtin.lsp_workspace_symbols, { desc = '[P]ro vim.keymap.set('n', 'sb', builtin.git_branches, { desc = '[S]earch [B]ranches' }) vim.keymap.set('n', 'sc', builtin.git_commits, { desc = '[S]earch [C]ommits' }) + -- TODO: Look into the following -- builtin.git_commits -- builtin.git_branches -- cgit v1.3.1