From 95f7054191777d3801f396a2d7eb3b8f93a9a467 Mon Sep 17 00:00:00 2001
From: Avery Felts <averyfelts@Averys-MacBook-Air.local>
Date: Sat, 31 Jan 2026 21:50:57 -0700
Subject: [PATCH] removed bufferline

---
 lua/core/keymaps.lua   | 22 +++++++-----------
 lua/plugins/plugin.lua | 53 ------------------------------------------
 2 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
index 4851b00..b046a95 100644
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -26,20 +26,16 @@ keymap('n', '<C-l>', '<C-w>l')
 keymap('n', '<leader>w', ':w<CR>', { desc = "Save" })
 keymap('n', '<leader>q', ':q<CR>', { desc = "Quit" })
 
--- Buffer navigation (bufferline)
-keymap('n', '<leader>bp', '<cmd>BufferLineTogglePin<CR>', { desc = "Pin buffer" })
-keymap('n', '<leader>bP', '<cmd>BufferLineGroupClose ungrouped<CR>', { desc = "Close non-pinned" })
-keymap('n', '<leader>bo', '<cmd>BufferLineCloseOthers<CR>', { desc = "Close other buffers" })
-keymap('n', '<leader>bl', '<cmd>BufferLineCloseRight<CR>', { desc = "Close buffers to right" })
-keymap('n', '<leader>bh', '<cmd>BufferLineCloseLeft<CR>', { desc = "Close buffers to left" })
-keymap('n', '<leader>1', '<cmd>BufferLineGoToBuffer 1<CR>', { desc = "Go to buffer 1" })
-keymap('n', '<leader>2', '<cmd>BufferLineGoToBuffer 2<CR>', { desc = "Go to buffer 2" })
-keymap('n', '<leader>3', '<cmd>BufferLineGoToBuffer 3<CR>', { desc = "Go to buffer 3" })
-keymap('n', '<leader>4', '<cmd>BufferLineGoToBuffer 4<CR>', { desc = "Go to buffer 4" })
-keymap('n', '<leader>5', '<cmd>BufferLineGoToBuffer 5<CR>', { desc = "Go to buffer 5" })
+-- Buffer navigation (native)
+keymap('n', '<leader>1', '<cmd>buffer 1<CR>', { desc = "Go to buffer 1" })
+keymap('n', '<leader>2', '<cmd>buffer 2<CR>', { desc = "Go to buffer 2" })
+keymap('n', '<leader>3', '<cmd>buffer 3<CR>', { desc = "Go to buffer 3" })
+keymap('n', '<leader>4', '<cmd>buffer 4<CR>', { desc = "Go to buffer 4" })
+keymap('n', '<leader>5', '<cmd>buffer 5<CR>', { desc = "Go to buffer 5" })
 keymap('n', '<leader>bd', '<cmd>bdelete<CR>', { desc = "Delete buffer" })
-keymap('n', '<S-l>', '<cmd>BufferLineCycleNext<CR>', { desc = "Next buffer" })
-keymap('n', '<S-h>', '<cmd>BufferLineCyclePrev<CR>', { desc = "Previous buffer" })
+keymap('n', '<leader>bo', '<cmd>%bd|e#|bd#<CR>', { desc = "Close other buffers" })
+keymap('n', '<S-l>', '<cmd>bnext<CR>', { desc = "Next buffer" })
+keymap('n', '<S-h>', '<cmd>bprevious<CR>', { desc = "Previous buffer" })
 
 -- Terminal (toggleterm)
 keymap('n', '<leader>tf', '<cmd>ToggleTerm direction=float<CR>', { desc = "Float terminal" })
diff --git a/lua/plugins/plugin.lua b/lua/plugins/plugin.lua
index 874b682..e312771 100644
--- a/lua/plugins/plugin.lua
+++ b/lua/plugins/plugin.lua
@@ -70,59 +70,6 @@ return {
         end,
     },
 
-    -- Bufferline (tab management)
-    {
-        "akinsho/bufferline.nvim",
-        version = "*",
-        dependencies = { "nvim-tree/nvim-web-devicons", "catppuccin/nvim" },
-        config = function()
-            require("bufferline").setup({
-                options = {
-                    mode = "buffers",
-                    themable = true,
-                    numbers = "ordinal",
-                    close_command = "bdelete! %d",
-                    right_mouse_command = "bdelete! %d",
-                    indicator = {
-                        icon = "| ",
-                        style = "icon",
-                    },
-                    buffer_close_icon = "",
-                    modified_icon = "●",
-                    close_icon = "",
-                    left_trunc_marker = "",
-                    right_trunc_marker = "",
-                    diagnostics = "nvim_lsp",
-                    diagnostics_indicator = function(count, level)
-                        local icon = level:match("error") and " " or " "
-                        return " " .. icon .. count
-                    end,
-                    offsets = {
-                        {
-                            filetype = "NvimTree",
-                            text = "File Explorer",
-                            highlight = "Directory",
-                            separator = true,
-                        },
-                    },
-                    color_icons = true,
-                    show_buffer_icons = true,
-                    show_buffer_close_icons = true,
-                    show_close_icon = true,
-                    show_tab_indicators = true,
-                    separator_style = "slant",
-                    always_show_bufferline = true,
-                    hover = {
-                        enabled = true,
-                        delay = 200,
-                        reveal = { "close" },
-                    },
-                },
-                highlights = require("catppuccin.groups.integrations.bufferline").get(),
-            })
-        end,
-    },
-
     -- Toggleterm (integrated terminal)
     {
         "akinsho/toggleterm.nvim",