diff --git a/.config/nvim/lua/core/init.lua b/.config/nvim/lua/core/init.lua
index ff60db6..5eea501 100644
--- a/.config/nvim/lua/core/init.lua
+++ b/.config/nvim/lua/core/init.lua
@@ -9,8 +9,10 @@ require('plugins')
 -- load configs dependent on plugins
 -- load terraform formatter which requires plugins to be installed (plenary.nvim)
 require('core.terra_fmt')
-require('core.fugitive')
+--require('core.fugitive')
 require('core.settings')
 require('core.lsp')
 require('core.harpoon')
 require('core.treesitter')
+require('core.lualine')
+require('core.lazygit')
diff --git a/.config/nvim/lua/core/lazygit.lua b/.config/nvim/lua/core/lazygit.lua
new file mode 100644
index 0000000..4b044f9
--- /dev/null
+++ b/.config/nvim/lua/core/lazygit.lua
@@ -0,0 +1,4 @@
+-- Description: Neogit plugin configuration
+-- local neogit = require('neogit')
+
+--vim.keymap.set("n", "<leader>gs", vim.cmd.Neogit)
diff --git a/.config/nvim/lua/core/lualine.lua b/.config/nvim/lua/core/lualine.lua
new file mode 100644
index 0000000..4ad46d7
--- /dev/null
+++ b/.config/nvim/lua/core/lualine.lua
@@ -0,0 +1,40 @@
+require('lualine').setup {
+  options = {
+    icons_enabled = true,
+    theme = 'papercolor_light',
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    globalstatus = false,
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = {'branch', 'diff', 'diagnostics'},
+    lualine_c = {'filename'},
+    lualine_x = {'encoding', 'fileformat', 'filetype'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+  tabline = {},
+  winbar = {},
+  inactive_winbar = {},
+  extensions = {}
+}
diff --git a/.config/nvim/lua/plugins/config/whichkey.lua b/.config/nvim/lua/plugins/config/whichkey.lua
index 222fb79..1623886 100644
--- a/.config/nvim/lua/plugins/config/whichkey.lua
+++ b/.config/nvim/lua/plugins/config/whichkey.lua
@@ -42,12 +42,13 @@ wk.register({
 		s = { "<cmd>w<cr>", "  Save" },
 		q = { "<cmd>q<cr>", "  Quit" },
 		Q = { "<cmd>q!<cr>", "  Force Quit" },
+        a = { "<cmd>qa<cr>", "   Quit All" },
 	},
 	g = {
 		name = "۸ Git & </> LSP",
 		b = { "<cmd>Telescope git_branches<cr>", " Git Branches" },
 		c = { "<cmd>Telescope git_commits<cr>", "  Git Commits" },
-		s = { vim.cmd.Git, "  Git Status" },
+		s = { "<cmd>Neogit<cr>", "  Git Status" },
 	},
 }, {prefix = "<leader>"})
 
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index a227c4a..a200d16 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -16,7 +16,7 @@ vim.opt.rtp:prepend(lazypath)
 -- Plugins I use
 local plugs = {
 	-- Essential Plugins
-	'tpope/vim-fugitive',
+	--'tpope/vim-fugitive',
 	{
 	  'windwp/nvim-autopairs',
 	  init = function()
@@ -24,7 +24,14 @@ local plugs = {
 	  end
 	},
 	'mbbill/undotree',
-	'vim-airline/vim-airline',
+    {
+        'nvim-lualine/lualine.nvim',
+        dependencies = {
+            'nvim-tree/nvim-web-devicons'
+        }
+
+    },
+	-- 'vim-airline/vim-airline',
 	'github/copilot.vim',
 	{
 		'nvim-treesitter/nvim-treesitter',
@@ -123,6 +130,16 @@ local plugs = {
           "nvim-telescope/telescope.nvim"
         }
     },
+    -- NeoGit, a replacement for Vim Fugitive
+    {
+        "NeogitOrg/neogit",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "sindrets/diffview.nvim", -- git diff integration
+            "nvim-telescope/telescope.nvim"
+        },
+        config = true
+    }
 
 	-- Other Optionals
 	-- 'vim-airline/vim-airline-themes',