From 0dcbf5978624b2197b91e310eab00d1343c279c1 Mon Sep 17 00:00:00 2001
From: Kyren223 <ulmliad223@gmail.com>
Date: Tue, 9 Jul 2024 22:57:07 +0300
Subject: Neovim: finished git configuration, other than waiting for merge
 conflicts to see how the mrging works

---
 .config/nvim/lua/custom/git.lua              | 13 +++++++++----
 .config/nvim/lua/custom/plugins/TODO-git.lua | 14 --------------
 .config/nvim/lua/custom/plugins/git.lua      | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 .config/nvim/lua/custom/plugins/TODO-git.lua
 create mode 100644 .config/nvim/lua/custom/plugins/git.lua

(limited to '.config/nvim')

diff --git a/.config/nvim/lua/custom/git.lua b/.config/nvim/lua/custom/git.lua
index b30deb5..34320aa 100644
--- a/.config/nvim/lua/custom/git.lua
+++ b/.config/nvim/lua/custom/git.lua
@@ -40,10 +40,15 @@ set('n', '<leader>gD', gitsigns.toggle_deleted, { desc = '[G]it [D]eleted' })
 set('n', '<leader>gd', '<cmd>DiffviewOpen<cr>', { desc = '[G]it [D]iff' })
 set('n', '<leader>gl', '<cmd>DiffviewFileHistory<cr>', { desc = '[G]it [L]og' })
 set('n', '<leader>gs', '<cmd>Neogit<cr>', { desc = '[G]it [S]tatus' })
-set('n', '<leader>ga', 'TODO:', { desc = '[G]it [A]dd' })
-set('n', '<leader>gc', 'TODO:', { desc = '[G]it [C]ommit' })
-set('n', '<leader>gp', 'TODO:', { desc = '[G]it [P]ush' })
-set('n', '<leader>gP', 'TODO:', { desc = '[G]it [P]ull' })
+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' })
+-- NOTE: Waiting to actually have my next merge conflict and 
+-- see how diffview handles and then deciding if I want to use
+-- neogit or diffview for merge (prob diffview), same with rebase 
+-- althoug I don't think I will use rebase anytime soon
+set('n', '<leader>gr', 'TODO:', { desc = '[G]it [R]ebase' })
+set('n', '<leader>gm', 'TODO:', { desc = '[G]it [M]erge' })
 
 -- Hunk Keymaps
 local function stage_visual_chunk()
diff --git a/.config/nvim/lua/custom/plugins/TODO-git.lua b/.config/nvim/lua/custom/plugins/TODO-git.lua
deleted file mode 100644
index 565d19c..0000000
--- a/.config/nvim/lua/custom/plugins/TODO-git.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-    'NeogitOrg/neogit',
-    dependencies = {
-        'nvim-lua/plenary.nvim',
-        'nvim-telescope/telescope.nvim',
-        'sindrets/diffview.nvim',
-        'tpope/vim-fugitive',
-        'lewis6991/gitsigns.nvim',
-        'pwntester/octo.nvim',
-    },
-    config = function()
-        require('custom.git')
-    end,
-}
diff --git a/.config/nvim/lua/custom/plugins/git.lua b/.config/nvim/lua/custom/plugins/git.lua
new file mode 100644
index 0000000..565d19c
--- /dev/null
+++ b/.config/nvim/lua/custom/plugins/git.lua
@@ -0,0 +1,14 @@
+return {
+    'NeogitOrg/neogit',
+    dependencies = {
+        'nvim-lua/plenary.nvim',
+        'nvim-telescope/telescope.nvim',
+        'sindrets/diffview.nvim',
+        'tpope/vim-fugitive',
+        'lewis6991/gitsigns.nvim',
+        'pwntester/octo.nvim',
+    },
+    config = function()
+        require('custom.git')
+    end,
+}
-- 
cgit v1.3.1