From 837e5418d6e3246b2849e0a3e50bedd87f0bcd14 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Tue, 28 Jun 2022 02:42:37 +0200
Subject: [PATCH] VIM: Smart buffer handling

---
 vim/config/keybindings.vim | 38 ++++++++++++++++++++++++++++++++++++++
 vim/config/plugins.vim     |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/vim/config/keybindings.vim b/vim/config/keybindings.vim
index da27029..e036b9b 100644
--- a/vim/config/keybindings.vim
+++ b/vim/config/keybindings.vim
@@ -61,3 +61,41 @@ autocmd Filetype rmd imap <F5> <ESC><ESC>:w\|:!echo<space>"require(rmarkdown);<s
 
 map <F1> <Esc>
 imap <F1> <Esc>
+
+" nvim smartbuffs
+" Jump to the N buffer (by index) according to :ls buffer list
+" where N is NOT the buffer number but the INDEX in such list
+" NOTE: it does not include terminal buffers
+nnoremap <Leader>1 :lua require("nvim-smartbufs").goto_buffer(1)<CR>
+nnoremap <Leader>2 :lua require("nvim-smartbufs").goto_buffer(2)<CR>
+nnoremap <Leader>3 :lua require("nvim-smartbufs").goto_buffer(3)<CR>
+nnoremap <Leader>4 :lua require("nvim-smartbufs").goto_buffer(4)<CR>
+nnoremap <Leader>5 :lua require("nvim-smartbufs").goto_buffer(5)<CR>
+nnoremap <Leader>6 :lua require("nvim-smartbufs").goto_buffer(6)<CR>
+nnoremap <Leader>7 :lua require("nvim-smartbufs").goto_buffer(7)<CR>
+nnoremap <Leader>8 :lua require("nvim-smartbufs").goto_buffer(8)<CR>
+nnoremap <Leader>9 :lua require("nvim-smartbufs").goto_buffer(9)<CR>
+
+" Improved :bnext :bprev behavior (without considering terminal buffers)
+nnoremap <Right> :lua require("nvim-smartbufs").goto_next_buffer()<CR>
+nnoremap <Left> :lua require("nvim-smartbufs").goto_prev_buffer()<CR>
+
+" Open terminal buffer and set it as hidden so it won't get deleted
+nnoremap <Leader>c1 :lua require("nvim-smartbufs").goto_terminal(1)<CR>
+nnoremap <Leader>c2 :lua require("nvim-smartbufs").goto_terminal(2)<CR>
+nnoremap <Leader>c3 :lua require("nvim-smartbufs").goto_terminal(3)<CR>
+nnoremap <Leader>c4 :lua require("nvim-smartbufs").goto_terminal(4)<CR>
+
+" Delete current buffer and goes back to the previous one
+nnoremap <Leader>qq :lua require("nvim-smartbufs").close_current_buffer()<CR>
+
+" Delete the N buffer according to :ls buffer list
+nnoremap <Leader>q1 :lua require("nvim-smartbufs").close_buffer(1)<CR>
+nnoremap <Leader>q2 :lua require("nvim-smartbufs").close_buffer(2)<CR>
+nnoremap <Leader>q3 :lua require("nvim-smartbufs").close_buffer(3)<CR>
+nnoremap <Leader>q4 :lua require("nvim-smartbufs").close_buffer(4)<CR>
+nnoremap <Leader>q5 :lua require("nvim-smartbufs").close_buffer(5)<CR>
+nnoremap <Leader>q6 :lua require("nvim-smartbufs").close_buffer(6)<CR>
+nnoremap <Leader>q7 :lua require("nvim-smartbufs").close_buffer(7)<CR>
+nnoremap <Leader>q8 :lua require("nvim-smartbufs").close_buffer(8)<CR>
+nnoremap <Leader>q9 :lua require("nvim-smartbufs").close_buffer(9)<CR>
diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim
index a23fe38..7383b4d 100644
--- a/vim/config/plugins.vim
+++ b/vim/config/plugins.vim
@@ -101,7 +101,9 @@ Plug 'rad4day/vim-ripgrep'
 
 Plug 'github/copilot.vim'
 
+" Fancy buffer handling
 Plug 'akinsho/bufferline.nvim', { 'tag': 'v2.2.1' }
+Plug 'johann2357/nvim-smartbufs'
 
 Plug 'braxtons12/blame_line.nvim'