From fdd222cdd200d84217aca83bb9b9dbb55f10261b Mon Sep 17 00:00:00 2001
From: 409 <bloecker.s@gmail.com>
Date: Sat, 22 Jun 2024 13:12:23 +0200
Subject: [PATCH] feat: switched back to vim-fugitive

---
 lazy-lock.json            | 23 +++++++++++------------
 lua/409/plugins/git.lua   | 26 ++++----------------------
 lua/409/plugins/theme.lua | 17 -----------------
 3 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 4237d9e..319ca23 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,19 +2,18 @@
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
   "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
-  "catppuccin": { "branch": "main", "commit": "c0bea773a09e49e123136b099bce9ddc1bf395d2" },
+  "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "6e5d476e97dbd251cc2233d42fd238c810404701" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
+  "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" },
+  "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "flutter-tools.nvim": { "branch": "main", "commit": "990a1349c29f7d474a0cd51355aba773ccc9deea" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
+  "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
@@ -23,25 +22,25 @@
   "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" },
   "mini.surround": { "branch": "main", "commit": "3cb5b509ad34f2402df4b977be607a614c8c7524" },
   "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
-  "neogit": { "branch": "master", "commit": "11dea1b67bb153cd5b4a2de348ceefa69508dfce" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3c8346db23033fa49ce0eef2e89dbe91cfd54f21" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" },
-  "nvim-treesitter": { "branch": "master", "commit": "f7edd3f5f636dceebc874a59bdcf9de6a41dbc68" },
+  "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" },
+  "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" },
   "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" },
   "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" },
-  "trouble.nvim": { "branch": "main", "commit": "58a3acfc6d8d819324dab4c87068596319032e64" },
+  "trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" },
   "tsc.nvim": { "branch": "main", "commit": "06734767eee606ebaa0a4645e0fd801c64e6aa7a" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "a95d8b61b3f9102f566462fc50781e3e7c769232" },
+  "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }
 }
\ No newline at end of file
diff --git a/lua/409/plugins/git.lua b/lua/409/plugins/git.lua
index e3f2343..4902cda 100644
--- a/lua/409/plugins/git.lua
+++ b/lua/409/plugins/git.lua
@@ -1,32 +1,14 @@
 return {
 	{
-		"NeogitOrg/neogit",
-		dependencies = {
-			"nvim-lua/plenary.nvim", -- required
-			"sindrets/diffview.nvim", -- optional - Diff integration
-
-			"nvim-telescope/telescope.nvim", -- optional
-		},
+		"tpope/vim-fugitive",
         keys = {
             {
                 "<leader>gs",
-                ":Neogit<CR>",
-                desc = "Neogit"
+                ":Git<CR>",
+                desc = "Fugitive"
             },
         },
-        opts = {
-            signs = {
-                item = { ">", "v" },
-                section = { ">", "v" },
-            },
-            mappings = {
-                status = {
-                    ["="] = "Toggle",
-                    ["<tab>"] = false,
-                },
-            },
-        },
-		config = true,
+        lazy = true,
 	},
 	{
 		"echasnovski/mini.diff",
diff --git a/lua/409/plugins/theme.lua b/lua/409/plugins/theme.lua
index 92cf711..068f233 100644
--- a/lua/409/plugins/theme.lua
+++ b/lua/409/plugins/theme.lua
@@ -22,23 +22,6 @@ return {
             vim.api.nvim_set_hl(0, "PmenuSbar", { link = "Normal" })
             vim.api.nvim_set_hl(0, "CmpPmenuBorder", { fg = catppuccin_colors.surface2 })
             vim.api.nvim_set_hl(0, "MiniIndentscopeSymbol", { fg = catppuccin_colors.surface2 })
-
-            vim.api.nvim_set_hl(0, "NeogitHunkHeaderCursor", { fg = catppuccin_colors.blue, bg = "none", bold = true })
-            vim.api.nvim_set_hl(0, "NeogitHunkHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
-            vim.api.nvim_set_hl(0, "NeogitHunkHeaderHighlight", { link = "NeogitHunkHeader" })
-            vim.api.nvim_set_hl(0, "NeogitDiffAddHighlight", { fg = catppuccin_colors.green, bg = "none" })
-            vim.api.nvim_set_hl(0, "NeogitDiffDeleteHighlight", { fg = catppuccin_colors.red, bg = "none" })
-            vim.api.nvim_set_hl(0, "NeogitDiffContextHighlight", { link = "Normal" })
-            vim.api.nvim_set_hl(0, "NeogitDiffContextCursor", { link = "Normal" })
-            vim.api.nvim_set_hl(0, "NeogitDiffAddCursor", { link = "NeogitDiffAddHighlight" })
-            vim.api.nvim_set_hl(0, "NeogitDiffDeleteCursor", { link = "NeogitDiffDeleteHighlight" })
-
-            vim.api.nvim_set_hl(0, "NeogitDiffHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
-            vim.api.nvim_set_hl(0, "NeogitDiffAdd", { link = "NeogitDiffAddHighlight" })
-            vim.api.nvim_set_hl(0, "NeogitDiffDelete", { link = "NeogitDiffDeleteHighlight" })
-            vim.api.nvim_set_hl(0, "NeogitDiffContext", { link = "NeogitDiffContextHighlight" })
-
-            vim.api.nvim_set_hl(0, "NeogitCommitViewHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
         end
     },
 }