Neovim: almost finished with git integration, did minor unrelated tweaks

7 files changed, 23 insertions, 40 deletions

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', '<leader>gp', ':Gitsigns preview_hunk<cr>', { desc = '[G]it [P]review' })
-            vim.keymap.set('n', '<leader>gb', ':Gitsigns toggle_current_line_blame<cr>', { 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', '@', '@<C-x><C-o>', { silent = true, buffer = true })
-                    vim.keymap.set('i', '#', '#<C-x><C-o>', { silent = true, buffer = true })
-                end,
-            })
-            vim.keymap.set('n', '<leader>gi', ':Octo issue search<cr>', { 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', '<leader>r', ':OverseerRun<cr>', { desc = '[R]un Task' })
+        vim.keymap.set('n', '<leader>r', '<cmd>OverseerRun<cr>', { 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<CR>')
-            vim.keymap.set('n', 'C-j', ':TmuxNavigatorDown<CR>')
-            vim.keymap.set('n', 'C-k', ':TmuxNavigatorUp<CR>')
-            vim.keymap.set('n', 'C-l', ':TmuxNavigatorRight<CR>')
+            vim.keymap.set('n', 'C-h', '<cmd>TmuxNavigatorLeft<CR>')
+            vim.keymap.set('n', 'C-j', '<cmd>TmuxNavigatorDown<CR>')
+            vim.keymap.set('n', 'C-k', '<cmd>TmuxNavigatorUp<CR>')
+            vim.keymap.set('n', 'C-l', '<cmd>TmuxNavigatorRight<CR>')
         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', '<leader>nt', ':Neotree toggle reveal left<cr>', { desc = '[N]eotree [T]oggle' })
+        vim.keymap.set('n', '<leader>nt', '<cmd>Neotree toggle reveal left<cr>', { 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', '<leader>st', ':TodoTelescope keywords=TODO,FIX<cr>', { desc = '[S]earch [T]odos' })
-        vim.keymap.set('n', '<leader>lt', ':TodoTrouble<cr>', { desc = '[L]ist [T]odos' })
+        vim.keymap.set('n', '<leader>st', '<cmd>TodoTelescope keywords=TODO,FIX<cr>', { desc = '[S]earch [T]odos' })
+        vim.keymap.set('n', '<leader>lt', '<cmd>TodoTrouble<cr>', { 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', '<leader>cp', ':CccPick<cr>', { desc = '[C]olor [P]icker' })
-            vim.keymap.set('n', '<leader>ct', ':CccHighlighterToggle<cr>', { desc = '[C]olor [T]oggle' })
+            vim.keymap.set('n', '<leader>cp', '<cmd<CccPick<cr>', { desc = '[C]olor [P]icker' })
+            vim.keymap.set('n', '<leader>ct', '<cmd>CccHighlighterToggle<cr>', { desc = '[C]olor [T]oggle' })
         end,
     },
     {
         'RRethy/vim-illuminate',
         config = function()
-            vim.keymap.set('n', '<leader>it', ':IlluminateToggle<cr>', { desc = '[I]lluminate [Tloggle]' })
+            vim.keymap.set('n', '<leader>it', '<cmd>IlluminateToggle<cr>', { 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', '<C-s>', 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', '<leader>nc', ':Telescope neoclip plus<cr>', { desc = '[N]eo[c]lip History' })
+            vim.keymap.set('n', '<leader>nc', '<cmd>Telescope neoclip plus<cr>', { desc = '[N]eo[c]lip History' })
         end,
     },
     {
@@ -54,5 +51,5 @@ return {
     -- NOTE: No keybindings, use `:Spectre` or `:Spectre <file>`
     -- 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' },
 }