5 files changed, 31 insertions, 4 deletions
diff --git a/.config/nvim/lua/plugins/comment.lua b/.config/nvim/lua/plugins/comment.lua
index 6e9a55e..02eb39d 100644
--- a/.config/nvim/lua/plugins/comment.lua
+++ b/.config/nvim/lua/plugins/comment.lua
@@ -16,7 +16,6 @@ return {
     config = function()
         local api = require('Comment.api')
         local esc = vim.api.nvim_replace_termcodes('<ESC>', true, false, true)
-        -- TODO: Stay in visual mode and keep the same selection even after commenting
         local toggole_linewise_selection = function()
             vim.api.nvim_feedkeys(esc, 'nx', false)
             api.toggle.linewise(vim.fn.visualmode())
diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua
index 0244f1d..610511e 100644
--- a/.config/nvim/lua/plugins/completions.lua
+++ b/.config/nvim/lua/plugins/completions.lua
@@ -30,6 +30,7 @@ return {
                     end,
                 },
                 window = {
+                    -- TODO: remove border for completions
                     completion = cmp.config.window.bordered(),
                     documentation = cmp.config.window.bordered(),
                 },
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
new file mode 100644
index 0000000..bd022b9
--- /dev/null
+++ b/.config/nvim/lua/plugins/git.lua
@@ -0,0 +1,28 @@
+return {
+    {
+        '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,
+    },
+}
diff --git a/.config/nvim/lua/plugins/neotree.lua b/.config/nvim/lua/plugins/neotree.lua
index 61968e7..ab4db82 100644
--- a/.config/nvim/lua/plugins/neotree.lua
+++ b/.config/nvim/lua/plugins/neotree.lua
@@ -7,6 +7,6 @@ return {
         'MunifTanjim/nui.nvim',
     },
     config = function()
-        vim.keymap.set('n', '<leader>gp', ':Neotree toggle reveal left<cr>', { desc = '[G]oto [P]roject (toggle)' })
+        vim.keymap.set('n', '<leader>nt', ':Neotree toggle reveal left<cr>', { desc = '[N]eotree [T]oggle' })
     end,
 }
diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua
index b4b3b69..eeeb327 100644
--- a/.config/nvim/lua/plugins/oil.lua
+++ b/.config/nvim/lua/plugins/oil.lua
@@ -4,7 +4,6 @@ return {
     opts = {},
     config = function ()
         require("oil").setup()
-        vim.keymap.set('n', 'gp', ':Oil --float<cr>', { desc = '[G]oto [P]roject (floating)' })
-        vim.keymap.set('n', '<leader>of', ':Oil --float<cr>', { desc = '[G]oto [P]roject (floating)' })
+        vim.keymap.set('n', '<leader>of', ':Oil --float<cr>', { desc = '[O]il [F]ilesystem' })
     end
 }