diff --git a/lazy-lock.json b/lazy-lock.json
index 7743fef..47d5792 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,6 +9,7 @@
   "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
   "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
+  "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" },
@@ -36,6 +37,5 @@
   "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
   "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
   "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
-  "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 99fb667..d52742a 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -1,135 +1,153 @@
 return {
-	{
-		"nvim-neo-tree/neo-tree.nvim",
-		branch = "v3.x",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"nvim-tree/nvim-web-devicons",
-			"MunifTanjim/nui.nvim",
-		},
-		config = function()
-			vim.keymap.set("n", "<Leader>ee", ":Neotree toggle<CR>", { desc = "Toggle Neotree" })
-			vim.keymap.set("n", "<Leader>er", ":Neotree reveal<CR>", { desc = "Reveal file" })
+    {
+        "nvim-neo-tree/neo-tree.nvim",
+        branch = "v3.x",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "nvim-tree/nvim-web-devicons",
+            "MunifTanjim/nui.nvim",
+        },
+        config = function()
+            vim.keymap.set("n", "<Leader>ee", ":Neotree toggle<CR>", { desc = "Toggle Neotree" })
+            vim.keymap.set("n", "<Leader>er", ":Neotree reveal<CR>", { desc = "Reveal file" })
 
-			local nt = require("neo-tree")
+            local nt = require("neo-tree")
 
-			nt.setup({
-				open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
-				filesystem = {
-					filtered_items = {
-						show_hidden_count = false,
-						hide_dotfiles = false,
-						hide_gitignored = true,
-						always_show = {
-							".env",
-						},
-						never_show = {
-							".git",
-							"thumbs.db",
-							".DS_Store",
-						},
-					},
-				},
-				window = {
-					mappings = {
-						["m"] = {
-							"move",
-							config = {
-								show_path = "relative",
-							},
-						},
-					},
-				},
-				event_handlers = {
-					{
-						event = "neo_tree_popup_input_ready",
-						handler = function()
-							-- Switch to normal inside popups by default.
-							vim.cmd.stopinsert()
-						end,
-					},
-				},
-			})
-		end,
-	},
-	{
-		"folke/which-key.nvim",
-		event = "VeryLazy",
-		init = function()
-			vim.o.timeout = true
-			vim.o.timeoutlen = 300
-		end,
-		opts = {},
-	},
-	{
-		"folke/trouble.nvim",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-		config = function()
-			vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
-		end,
-	},
-	{
-		"folke/todo-comments.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		opts = {},
-	},
-	{
-		"nvim-pack/nvim-spectre",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		opts = { open_cmd = "noswapfile vnew" },
-		keys = {
-			{
-				"<leader>sr",
-				function()
-					require("spectre").open()
-				end,
-				desc = "Replace in Files (Spectre)",
-			},
-		},
-	},
-	{
-		"nvim-telescope/telescope.nvim",
-		tag = "0.1.5",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		config = function()
-			local builtin = require("telescope.builtin")
-
-			vim.keymap.set("n", "<Leader>ff", builtin.git_files, { desc = "Search git_files" })
-			vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" })
-			vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" })
-			vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" })
-			vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" })
-		end,
-	},
-	{
-		"nvim-telescope/telescope-ui-select.nvim",
-		config = function()
-			require("telescope").setup({
-				defaults = {
-					initial_mode = "normal",
-				},
-				extensions = {
-					["ui-select"] = {
-						require("telescope.themes").get_dropdown({}),
-					},
-				},
-			})
-
-			require("telescope").load_extension("ui-select")
-		end,
-	},
-	{
-		"folke/flash.nvim",
-		event = "VeryLazy",
-		---@type Flash.Config
-		opts = {},
-    -- stylua: ignore
-    keys = {
-      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-      { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-      { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-      { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+            nt.setup({
+                open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
+                filesystem = {
+                    filtered_items = {
+                        show_hidden_count = false,
+                        hide_dotfiles = false,
+                        hide_gitignored = true,
+                        always_show = {
+                            ".env",
+                        },
+                        never_show = {
+                            ".git",
+                            "thumbs.db",
+                            ".DS_Store",
+                        },
+                    },
+                },
+                window = {
+                    mappings = {
+                        ["m"] = {
+                            "move",
+                            config = {
+                                show_path = "relative",
+                            },
+                        },
+                    },
+                },
+                event_handlers = {
+                    {
+                        event = "neo_tree_popup_input_ready",
+                        handler = function()
+                            -- Switch to normal inside popups by default.
+                            vim.cmd.stopinsert()
+                        end,
+                    },
+                },
+            })
+        end,
     },
-	},
+    {
+        "folke/which-key.nvim",
+        event = "VeryLazy",
+        init = function()
+            vim.o.timeout = true
+            vim.o.timeoutlen = 300
+        end,
+        opts = {},
+    },
+    {
+        "folke/trouble.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        config = function()
+            vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
+        end,
+    },
+    {
+        "folke/todo-comments.nvim",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        opts = {},
+    },
+    {
+        "nvim-pack/nvim-spectre",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        opts = { open_cmd = "noswapfile vnew" },
+        keys = {
+            {
+                "<leader>sr",
+                function()
+                    require("spectre").open()
+                end,
+                desc = "Replace in Files (Spectre)",
+            },
+        },
+    },
+    {
+        "nvim-telescope/telescope.nvim",
+        tag = "0.1.5",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = function()
+            local builtin = require("telescope.builtin")
+
+            vim.keymap.set("n", "<Leader>ff", builtin.git_files, { desc = "Search git_files" })
+            vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" })
+            vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" })
+            vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" })
+            vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" })
+        end,
+    },
+    {
+        "nvim-telescope/telescope-ui-select.nvim",
+        config = function()
+            require("telescope").setup({
+                defaults = {
+                    initial_mode = "normal",
+                },
+                extensions = {
+                    ["ui-select"] = {
+                        require("telescope.themes").get_dropdown({}),
+                    },
+                },
+            })
+
+            require("telescope").load_extension("ui-select")
+        end,
+    },
+    {
+        "folke/flash.nvim",
+        event = "VeryLazy",
+        ---@type Flash.Config
+        opts = {},
+        -- stylua: ignore
+        keys = {
+            { "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
+            { "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
+            { "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+            { "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+            { "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
+        },
+    },
+    {
+        "kdheepak/lazygit.nvim",
+        event = "VeryLazy",
+        cmd = {
+            "LazyGit",
+            "LazyGitConfig",
+            "LazyGitCurrentFile",
+            "LazyGitFilter",
+            "LazyGitFilterCurrentFile",
+        },
+        -- optional for floating window border decoration
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
+        keys = {
+            { "<leader>gs", "<cmd>LazyGit<cr>", desc = "LazyGit" }
+        }
+    }
 }
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
deleted file mode 100644
index 684d54b..0000000
--- a/lua/plugins/fugitive.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-	"tpope/vim-fugitive",
-	config = function()
-		vim.keymap.set("n", "<Leader>gs", vim.cmd.Git, { desc = "View `git status`" })
-		vim.keymap.set("n", "gh", "<cmd>diffget //2<CR>", { desc = "Pick gitdiff on left" })
-		vim.keymap.set("n", "gl", "<cmd>diffget //3<CR>", { desc = "Pick gitdiff on right" })
-		vim.keymap.set("n", "<Leader>gp", ":Git push<CR>", { desc = "Run `git push`" })
-		vim.keymap.set("n", "<Leader>gc", ":Git checkout ", { desc = "Git checkout" })
-	end,
-}