* HEAD master

Automated-commit-by: dots
Signed-off-by: Robert Günzler <r@gnzler.io>

1 files changed, 12 insertions, 4 deletions

diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index a93b8fd..3c51041 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -1,7 +1,12 @@
 local map = vim.keymap.set
 
-map('n', 'gb', '<cmd>bnext<cr>', { desc = 'Buffer next' })
-map('n', 'gB', '<cmd>bprevious<cr>', { desc = 'Buffer prev' })
+map('n', 'gb', '<cmd>bnext<cr>', { desc = 'Buf next' })
+map('n', 'gB', '<cmd>bprevious<cr>', { desc = 'Buf prev' })
+
+map('n', '<c-h>', '<cmd>tabprev<cr>', { desc = 'Tab prev' })
+map('n', '<c-j>', '<cmd>bprev<cr>', { desc = 'Buf prev' })
+map('n', '<c-k>', '<cmd>bnext<cr>', { desc = 'Buf next' })
+map('n', '<c-l>', '<cmd>tabnext<cr>', { desc = 'Tab next' })
 
 map('n', '<a-j>', '<cmd>cnext<cr>', { desc = 'Quickfix next' })
 map('n', '<a-k>', '<cmd>cprev<cr>', { desc = 'Quickfix prev' })
@@ -21,8 +26,11 @@ map(
 vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWinEnter' }, {
   group = vim.api.nvim_create_augroup('bufclose', {}),
   callback = function()
-    if vim.list_contains({ 'help', 'nofile', 'quickfix' }, vim.bo.buftype) then
-      map('', 'q', '<cmd>close<cr>', { desc = 'Close buffer', buffer = 0 })
+    if
+      (vim.fn.maparg('q', 'n') == '')
+      and vim.list_contains({ 'help', 'nofile', 'nowrite', 'quickfix' }, vim.bo.buftype)
+    then
+      map('n', 'q', '<cmd>close<cr>', { desc = 'Close buffer', buffer = 0 })
     end
   end,
 })