From a22d7b0130b616550946bd63f047de704850932c Mon Sep 17 00:00:00 2001
From: Jannik Donker <me@jannikdonker.de>
Date: Mon, 3 Nov 2025 19:28:26 +0100
Subject: [PATCH] added barbar + deps

---
 init.lua            | 63 +++++++++++++++++++++++++++++++++++----------
 nvim-pack-lock.json | 13 ++++++++++
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/init.lua b/init.lua
index 7278db2..ec9fdd2 100644
--- a/init.lua
+++ b/init.lua
@@ -33,9 +33,12 @@ vim.pack.add({
     { src = "https://github.com/dimitry-ishenko-neovim/lualine-nvim" },
     { src = "https://github.com/chomosuke/typst-preview.nvim" },
     { src = "https://github.com/kosayoda/nvim-lightbulb" },
-    { src = "https://codeberg.org/mfussenegger/nvim-jdtls.git" },
-    { src = "https://github.com/m4xshen/autoclose.nvim" },
+    { src = "https://codeberg.org/mfussenegger/nvim-jdtls.git",      dependencies = { "https://codeberg.org/mfussenegger/nvim-dap.git" } },
+    { src = "https://github.com/m4xshen/autoclose.nvim", },
     { src = "https://codeberg.org/mfussenegger/nvim-dap.git" },
+    { src = "https://github.com/romgrk/barbar.nvim" },
+    { src = "https://github.com/nvim-tree/nvim-web-devicons" },
+    { src = "https://github.com/lewis6991/gitsigns.nvim" },
 })
 
 vim.cmd("colorscheme gruvbox")
@@ -178,22 +181,25 @@ vim.api.nvim_create_autocmd('FileType', {
 
 -- KEYMAP START --
 
-vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format)
-vim.keymap.set("n", "<leader>gd", vim.lsp.buf.definition)
-vim.keymap.set("n", "<leader>gD", vim.lsp.buf.declaration)
-vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Code Action" })
-vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename symbol" })
+local map = vim.keymap
+local opts = { noremap = true, silent = true }
 
-vim.keymap.set("n", "<C-f>", ":Pick files<CR>")
-vim.keymap.set("n", "<C-g>", ":Pick grep_live<CR>")
-vim.keymap.set("n", "<C-h>", ":Pick help<CR>")
-vim.keymap.set("n", "<C-e>", ":Oil<CR>")
+map.set("n", "<leader>gf", vim.lsp.buf.format)
+map.set("n", "<leader>gd", vim.lsp.buf.definition)
+map.set("n", "<leader>gD", vim.lsp.buf.declaration)
+map.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Code Action" })
+map.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename symbol" })
 
-vim.keymap.set("n", "<leader>dg", function()
+map.set("n", "<C-f>", ":Pick files<CR>")
+map.set("n", "<C-g>", ":Pick grep_live<CR>")
+map.set("n", "<C-h>", ":Pick help<CR>")
+map.set("n", "<C-e>", ":Oil<CR>")
+
+map.set("n", "<leader>dg", function()
     vim.diagnostic.setqflist()
     vim.cmd("copen")
 end, { desc = "Show diagnostics in quickfix list" })
-vim.keymap.set("n", "<leader>qf>", function()
+map.set("n", "<leader>qf>", function()
     local qf_win = vim.fn.getwininfo(vim.fn.getqflist({ winid = 0 }).winid)
     if not qf_win or #qf_win == 0 then
         vim.cmd("copen")
@@ -202,6 +208,37 @@ vim.keymap.set("n", "<leader>qf>", function()
     end
 end, { desc = "Toggle quickfix list" })
 
+local map = vim.api.nvim_set_keymap
+local opts = { noremap = true, silent = true }
+
+-- Move to previous/next
+map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
+
+-- Re-order to previous/next
+map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
+map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
+
+-- Goto buffer in position...
+map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
+map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
+map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
+map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
+map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
+map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
+map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
+map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
+map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
+map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
+-- Pin/unpin buffer
+map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
+-- Close buffer
+map('n', '<A-w>', '<Cmd>BufferClose<CR>', opts)
+
+-- Magic buffer-picking mode
+map('n', '<C-p>',   '<Cmd>BufferPick<CR>', opts)
+map('n', '<C-s-p>', '<Cmd>BufferPickDelete<CR>', opts)
+
 -- KEYMAP END --
 
 vim.diagnostic.config({
diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json
index 8dea1b1..bca61d4 100644
--- a/nvim-pack-lock.json
+++ b/nvim-pack-lock.json
@@ -4,17 +4,30 @@
       "rev": "3f86702",
       "src": "https://github.com/m4xshen/autoclose.nvim"
     },
+    "barbar.nvim": {
+      "rev": "fb43699",
+      "src": "https://github.com/romgrk/barbar.nvim"
+    },
     "blink.cmp": {
       "version": "'v1.6.0'"
     },
+    "gitsigns.nvim": {
+      "rev": "20ad441",
+      "src": "https://github.com/lewis6991/gitsigns.nvim"
+    },
     "gruvbox.nvim": [],
     "lualine-nvim": [],
     "mason.nvim": [],
     "mini.pick": [],
+    "nvim-dap": [],
     "nvim-jdtls": [],
     "nvim-lightbulb": [],
     "nvim-lspconfig": [],
     "nvim-treesitter": [],
+    "nvim-web-devicons": {
+      "rev": "8dcb311",
+      "src": "https://github.com/nvim-tree/nvim-web-devicons"
+    },
     "oil.nvim": [],
     "typst-preview.nvim": []
   }