Simplify + add whichkey mappings

lua/plugins/config/bufdel.lua

@@ -1,4 +0,0 @@
-require("bufdel").setup {
-    next = "alternate",
-    quit = false
-}

lua/plugins/config/bufferline.lua

@@ -1,7 +0,0 @@
-require("bufferline").setup {
-    options = {
-        offsets = {{ filetype = "NvimTree", text = "File Explorer" }},
-        tab_size = 20,
-        separator_style = "thin"
-    }
-}

lua/plugins/config/catppuccin.lua

@@ -0,0 +1,9 @@
+require("catppuccin").setup {
+    integrations = {
+        lsp_trouble = true,
+        which_key = true,
+        barbar = true
+    }
+}
+
+vim.cmd[[colorscheme catppuccin]]

lua/plugins/config/cmp.lua

@@ -1,46 +0,0 @@
-local cmp = require("cmp")
-
-cmp.setup {
-    snippet = {
-        expand = function(args)
-            require("luasnip").lsp_expand(args.body)
-        end
-    },
-    mapping = {
-        ["<C-p>"] = cmp.mapping.select_prev_item(),
-        ["<C-n>"] = cmp.mapping.select_next_item(),
-        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-        ["<C-Space>"] = cmp.mapping.complete(),
-        ["<C-e>"] = cmp.mapping.close(),
-        ["<CR>"] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.Replace,
-            select = true,
-        },
-        ["<Tab>"] = function(fallback)
-            if cmp.visible() then
-                cmp.select_next_item()
-            elseif require("luasnip").expand_or_jumpable() then
-                vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
-            else
-                fallback()
-            end
-        end,
-        ["<S-Tab>"] = function(fallback)
-            if cmp.visible() then
-                cmp.select_prev_item()
-            elseif require("luasnip").jumpable(-1) then
-                vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
-            else
-                fallback()
-            end
-        end
-    },
-    sources = {
-        { name = "nvim_lsp" },
-        { name = "luasnip" },
-        { name = "buffer" },
-        { name = "nvim_lua" },
-        { name = "path" }
-    }
-}

lua/plugins/config/lualine.lua

@@ -2,9 +2,9 @@ require("lualine").setup {
     options = {
         theme = "catppuccin"
     },
+
     extensions = {
         "nvim-tree",
-        "toggleterm",
-        "quickfix"
+        "toggleterm"
     }
 }

lua/plugins/config/luasnip.lua

@@ -1,8 +0,0 @@
-local luasnip = require("luasnip")
-
-luasnip.config.set_config {
-    history = true,
-    updateevents = "TextChanged,TextChangedI"
-}
-
-require("luasnip/loaders/from_vscode").load()

lua/plugins/config/nvimtree.lua

@@ -1,25 +1,24 @@
 local g = vim.g
 
-g.nvim_tree_highlight_opened_files = 1
+g.nvim_tree_git_hl = 1
 g.nvim_tree_highlight_opened_files = 1
 g.nvim_tree_group_empty = 1
-g.nvim_tree_root_folder_modifier = table.concat { ":t:gs?$?/..", string.rep(" ", 1000), "?:gs?^??" }
+g.nvim_tree_create_in_closed_folder = 1
 
 require("nvim-tree").setup {
     disable_netrw = true,
-    ignore_ft_on_setup = { "dashboard" },
     hijack_cursor = true,
     update_cwd = true,
+
     update_focused_file = {
         enable = true,
         update_cwd = true
     },
-    git = {
-        ignore = false
-    },
+
     view = {
         hide_root_folder = true
     },
+
     renderer = {
         indent_markers = {
             enable = true

lua/plugins/config/treesitter.lua

@@ -1,19 +1,11 @@
 require("nvim-treesitter.configs").setup {
-    ensure_installed = {
-        "lua",
-        "typescript",
-        "tsx",
-        "json",
-        "javascript"
-    },
+    ensure_installed = { "lua", "bash", "cpp", "css", "go", "gomod", "html", "javascript", "json", "make", "python", "typescript" },
+
     highlight = {
-        enable = true,
-        use_languagetree = true
-    },
-    matchup = {
         enable = true
     },
-    context_commentstring = {
+    
+    matchup = {
         enable = true
     }
 }

lua/plugins/config/whichkey.lua

@@ -1,35 +1,46 @@
 local wk = require("which-key")
 
 wk.setup {
-    ignore_missing = true
+    ignore_missing = false
 }
 
 wk.register({
     ["<leader>"] = {
-        f = {
-            name = "Files",
-            f = { "<cmd>Telescope find_files<CR>", "Find File" },
-            g = { "<cmd>Telescope live_grep<CR>", "Live Grep" }
-        },
+        -- Barbar
         b = {
-            name = "Buffers",
-            b = { "<cmd>Telescope buffers<CR>", "Find Buffers" },
-            x = { "<cmd>BufDel<CR>", "Close Buffer" }
+            name = "Barbar",
+            x = { "<cmd>BufferClose<CR>", "Close Buffer" },
+            n = { "<cmd>BufferMoveNext<CR>", "Move Next" },
+            m = { "<cmd>BufferMovePrevious<CR>", "Move Previous" },
+            
+            p = {
+                name = "Pinned Buffers",
+                p = { "<cmd>BufferPin<CR>", "Pin Buffer" },
+                x = { "<cmd>BufferCloseAllButPinned<CR>", "Close All But Pinned" } 
+            }
         },
+
+        -- Telescope
         t = {
-            name = "NvimTree",
-            t = { "<cmd>NvimTreeToggle<CR>", "NvimTree Toggle" },
-            f = { "<cmd>NvimTreeFocus<CR>", "NvimTree Focus" }
+            name = "Telescope",
+            w = { "<cmd>Telescope live_grep<CR>", "Live Grep" },
+            f = { "<cmd>Telescope fd<CR>", "Find Files" },
+            c = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find In Current Buffer" },
+            b = { "<cmd>Telescope buffers<CR>", "Buffers" },
+            k = { "<cmd>Telescope keymaps<CR>", "Keymaps" }
+        },
+
+        g = {
+            name = "Git",
+            b = { "<cmd>Gitsigns blame_line<CR>", "Blame Line" },
+            d = { "<cmd>Gitsigns diffthis<CR>", "Diff" }
         }
     },
 
-    g = {
-        name = "Git",
-        c = { "<cmd>Telescope git_commits<CR>", "Git Commits" },
-        s = { "<cmd>Telescope git_status<CR>", "Git Status" },
-        b = { "<cmd>Gitsigns blame_line<CR>", "Blame Line" },
-        d = { "<cmd>Gitsigns diffthis<CR>", "Diff This" }
-    },
+    -- NvimTree
+    ["<C-n>"] = { "<cmd>NvimTreeToggle<CR>", "NvimTree Toggle" },
 
-    ["<TAB>"] = { "<cmd>BufferLineCycleNext<CR>", "Next Buffer" }
+    -- Barbar (switching buffers)
+    ["<TAB>"] = { "<cmd>BufferNext<CR>", "Next Buffer" },
+    ["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" }
 })