diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c126190..7db0abf 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,5 +1,4 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e1fe53117aab24c378d5e6deaad786789c360123" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -14,6 +13,7 @@
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
   "mini.nvim": { "branch": "main", "commit": "a508fc9c737045c5d8d194dcb6e9556c44309bb9" },
   "neogen": { "branch": "main", "commit": "de603d2f83a8eea7d799cc3e7a61ae02eb192110" },
+  "neogit": { "branch": "master", "commit": "748f922332cd697f69602d283f4f705cc7b022f4" },
   "neotest": { "branch": "master", "commit": "6435a367a57f267039c4c69a723cec09ae61b17e" },
   "neotest-python": { "branch": "master", "commit": "6c06041cfb45f45e276068020baa06c06fe20d5c" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "d3527936c4944baf0227c4f5b7fd64e7119ac13c" },
@@ -36,7 +36,6 @@
   "term-edit.nvim": { "branch": "master", "commit": "9efbb3298ce63807750a415a091d7d535ff0a7e8" },
   "toggleterm.nvim": { "branch": "main", "commit": "a44313fb28ed9bc9837c2b99dec1c6eed3a4f47f" },
   "trouble.nvim": { "branch": "main", "commit": "324c977cfeacb8498ca9ba1c74cc35bd18858a8d" },
-  "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" },
   "vim-monokai": { "branch": "master", "commit": "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f" },
   "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
   "wal.vim": { "branch": "master", "commit": "c72ba0d18946f29aab9c95eb6975d321c68b3681" },
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 37940de..43a944e 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -31,6 +31,7 @@ vim.keymap.set("n", "<leader>C", ":ToggleTerm<CR>", { desc = "Toggle Terminal" }
 vim.keymap.set("n", "<leader>ar", "<cmd>source ~/.config/nvim/init.lua<CR>", { desc = "Reload Config" })
 vim.keymap.set("n", "<leader>ac", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>", { desc = "Find Config Files" })
 vim.keymap.set("n", "<leader>an", "<cmd>NoNeckPain<CR>", { desc = "No Neck Pain" })
+vim.keymap.set("n", "<leader>ag", "<cmd>Neogit<CR>", { desc = "Neogit" })
 
 -- telescope
 vim.keymap.set("n", "<leader>tt", "<cmd>Telescope<CR>", { desc = "Telescope" })
@@ -40,16 +41,6 @@ vim.keymap.set("n", "<leader>tg", "<cmd>Telescope live_grep<CR>", { desc = "Grep
 vim.keymap.set("n", "<leader>ts", "<cmd>Telescope treesitter<CR>", { desc = "Tree Sitter" })
 vim.keymap.set("n", "<leader>td", "<cmd>Telescope lsp_document_symbols<CR>", { desc = "Document Symbols" })
 
--- git
-vim.keymap.set("n", "<leader>V", "<cmd>Git<CR>", { desc = "Status Board" })
-vim.keymap.set("n", "<leader>vA", ":Git add ", { desc = "Add" })
-vim.keymap.set("n", "<leader>va", "<cmd>Git add .<CR>", { desc = "Add All" })
-vim.keymap.set("n", "<leader>vc", "<cmd>Git commit<CR>", { desc = "Commit" })
-vim.keymap.set("n", "<leader>vf", "<cmd>Git fetch<CR>", { desc = "Fetch" })
-vim.keymap.set("n", "<leader>vg", ":Git ", { desc = "Enter Command" })
-vim.keymap.set("n", "<leader>vl", "<cmd>Git pull<CR>", { desc = "Pull" })
-vim.keymap.set("n", "<leader>vp", "<cmd>Git push origin HEAD<CR>", { desc = "Push" })
-
 -- dev
 vim.keymap.set("n", "<leader>gd", "<cmd>Telescope lsp_definitions<CR>", { desc = "Go To Definition" })
 vim.keymap.set("n", "<leader>gi", "<cmd>Telescope lsp_implementations<CR>", { desc = "Go To Implementations" })
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index d6e2320..dcf9aa2 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -136,17 +136,6 @@ require("lazy").setup({
 		},
 	},
 
-	-- comment.nvim
-	{
-		"numToStr/Comment.nvim",
-		config = function()
-			require("plugins.comment")
-		end,
-		keys = {
-			"gc",
-		},
-	},
-
 	-- neogen
 	{
 		"danymat/neogen",
@@ -185,7 +174,13 @@ require("lazy").setup({
 	-- git
 	--
 
-	"tpope/vim-fugitive",
+	-- "tpope/vim-fugitive",
+	{
+		"TimUntersberger/neogit",
+		config = function()
+			require("plugins.neogit")
+		end,
+	},
 	"sindrets/diffview.nvim",
 
 	--
@@ -273,4 +268,3 @@ require("lazy").setup({
 		end,
 	},
 })
-
diff --git a/.config/nvim/lua/plugins/comment.lua b/.config/nvim/lua/plugins/comment.lua
deleted file mode 100644
index bd47faf..0000000
--- a/.config/nvim/lua/plugins/comment.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("Comment").setup()
diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
index 39a8dc7..b55c800 100644
--- a/.config/nvim/lua/plugins/mini.lua
+++ b/.config/nvim/lua/plugins/mini.lua
@@ -1,2 +1,7 @@
 require("mini.ai").setup()
 require("mini.bracketed").setup()
+require("mini.comment").setup()
+require("mini.move").setup()
+require("mini.starter").setup()
+require("mini.tabline").setup()
+require("mini.surround").setup()
diff --git a/.config/nvim/lua/plugins/neogit.lua b/.config/nvim/lua/plugins/neogit.lua
new file mode 100644
index 0000000..5292fc4
--- /dev/null
+++ b/.config/nvim/lua/plugins/neogit.lua
@@ -0,0 +1,3 @@
+local neogit = require("neogit")
+
+neogit.setup({})