git tab

init.lua

@@ -57,10 +57,10 @@ vim.opt.guicursor = "n-v-c:block-blinkwait700-blinkoff400-blinkon250,i-ci-ve:ver
 -- Keymaps
 vim.keymap.set("n", "<leader>q", ":q<CR>", { desc = "Quit" })
 
--- NvChad tabufline keymaps (buffer/tab navigation)
-vim.keymap.set("n", "<Tab>", function() require("nvchad.tabufline").next() end, { desc = "Next buffer" })
-vim.keymap.set("n", "<S-Tab>", function() require("nvchad.tabufline").prev() end, { desc = "Previous buffer" })
-vim.keymap.set("n", "<leader>x", function() require("nvchad.tabufline").close_buffer() end, { desc = "Close buffer" })
+-- Buffer navigation (using native commands since tabufline is disabled)
+vim.keymap.set("n", "<Tab>", "<cmd>bnext<CR>", { desc = "Next buffer" })
+vim.keymap.set("n", "<S-Tab>", "<cmd>bprev<CR>", { desc = "Previous buffer" })
+vim.keymap.set("n", "<leader>x", "<cmd>bdelete<CR>", { desc = "Close buffer" })
 vim.keymap.set("n", "<leader>b", "<cmd>enew<CR>", { desc = "New buffer" })
 
 -- Load plugins

lua/plugins/neo-tree.lua

@@ -10,6 +10,7 @@ return {
   keys = {
     { "<leader>e", "<cmd>Neotree toggle<cr>", desc = "Toggle file explorer" },
     { "<BS>", "<cmd>Neotree toggle<cr>", desc = "Toggle file explorer" },
+    { "<leader>gs", "<cmd>Neotree git_status left<cr>", desc = "Focus git status" },
   },
   config = function()
     require("neo-tree").setup({
@@ -17,6 +18,16 @@ return {
       window = {
         width = 30,
       },
+      -- Source selector (tabs) to switch between files/git
+      source_selector = {
+        winbar = true,
+        content_layout = "center",
+        tabs_layout = "equal",
+        sources = {
+          { source = "filesystem", display_name = " Files" },
+          { source = "git_status", display_name = " Git" },
+        },
+      },
       filesystem = {
         follow_current_file = {
           enabled = true, -- Highlight and auto-expand to current file
@@ -29,6 +40,11 @@ return {
           hide_hidden = false, -- Show hidden files on Windows
         },
       },
+      git_status = {
+        follow_current_file = {
+          enabled = true,
+        },
+      },
     })
   end,
 }