From b148d27ff1b53efe3d1eb98f6f15a73bb16f42a7 Mon Sep 17 00:00:00 2001
From: Shawn Anderson <shawn@longtailfinancial.com>
Date: Thu, 29 Jun 2023 20:18:05 -0700
Subject: [PATCH] Add barbar for vim tabs bar and customize the keys.

---
 dotfiles/.config/nvim/init.vim              |  4 +-
 dotfiles/.config/nvim/keys.vim              |  4 +-
 dotfiles/.config/nvim/plugconfig/barbar.vim | 76 +++++++++++++++++++++
 dotfiles/.config/nvim/plugins.vim           |  6 ++
 4 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 dotfiles/.config/nvim/plugconfig/barbar.vim

diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim
index 1dc7c15..29c70e3 100644
--- a/dotfiles/.config/nvim/init.vim
+++ b/dotfiles/.config/nvim/init.vim
@@ -21,8 +21,8 @@ noremap <leader>j $
 set ignorecase      " ignores case of letters on searches
 set smartcase       " Override the 'ignorecase' option if the search pattern contains upper case characters
 map <leader>/ :nohl<CR>
-noremap <C-j> jj
-noremap <C-k> kk
+" noremap <C-j> jj
+" noremap <C-k> kk
 
 " This makes the location of the current open file always the current working
 " directory of vim. This pairs very nicely with tmux. Added - Sept 15th 2020
diff --git a/dotfiles/.config/nvim/keys.vim b/dotfiles/.config/nvim/keys.vim
index ea46e8f..9dc28a6 100644
--- a/dotfiles/.config/nvim/keys.vim
+++ b/dotfiles/.config/nvim/keys.vim
@@ -11,8 +11,8 @@ noremap <leader>j $
 map <leader>/ :nohl<CR>
 
 " Faster scrolling with control
-noremap <C-j> jj
-noremap <C-k> kk
+" noremap <C-j> jj
+" noremap <C-k> kk
 
 " Spookie bug. I think I was hacked and that someone i fucking with me. 
 " Whenever I would pres shift K it would open a new tab in nvim.
diff --git a/dotfiles/.config/nvim/plugconfig/barbar.vim b/dotfiles/.config/nvim/plugconfig/barbar.vim
new file mode 100644
index 0000000..340b262
--- /dev/null
+++ b/dotfiles/.config/nvim/plugconfig/barbar.vim
@@ -0,0 +1,76 @@
+" Apparently the following enables alt to work in vim. Source: https://stackoverflow.com/questions/6778961/alt-key-shortcuts-not-working-on-gnome-terminal-with-vim
+"let c='a'
+"while c <= 'z'
+  "exec "set <A-".c.">=\e".c
+  "exec "imap \e".c." <A-".c.">"
+  "let c = nr2char(1+char2nr(c))
+"endw
+"set timeout ttimeoutlen=50
+
+" Initialized 2023-06-29 from https://github.com/romgrk/barbar.nvim
+"
+"
+"
+" 
+" Move to previous/next
+nnoremap <silent>    <M-p> <Cmd>BufferPrevious<CR>
+nnoremap <silent>    <M-h> <Cmd>BufferPrevious<CR>
+nnoremap <silent>    <M-j> <Cmd>BufferPrevious<CR>
+nnoremap <silent>    <C-h> <Cmd>BufferPrevious<CR>
+nnoremap <silent>    <C-j> <Cmd>BufferPrevious<CR>
+nnoremap <silent>    <M-n> <Cmd>BufferNext<CR>
+nnoremap <silent>    <M-l> <Cmd>BufferNext<CR>
+nnoremap <silent>    <M-k> <Cmd>BufferNext<CR>
+nnoremap <silent>    <C-l> <Cmd>BufferNext<CR>
+nnoremap <silent>    <C-k> <Cmd>BufferNext<CR>
+
+" Re-order to previous/next
+nnoremap <silent>    <M-<> <Cmd>BufferMovePrevious<CR>
+nnoremap <silent>    <M->> <Cmd>BufferMoveNext<CR>
+
+" Goto buffer in position...
+nnoremap <silent>    <M-1> <Cmd>BufferGoto 1<CR>
+nnoremap <silent>    <M-2> <Cmd>BufferGoto 2<CR>
+nnoremap <silent>    <M-3> <Cmd>BufferGoto 3<CR>
+nnoremap <silent>    <M-4> <Cmd>BufferGoto 4<CR>
+nnoremap <silent>    <M-5> <Cmd>BufferGoto 5<CR>
+nnoremap <silent>    <M-6> <Cmd>BufferGoto 6<CR>
+nnoremap <silent>    <M-7> <Cmd>BufferGoto 7<CR>
+nnoremap <silent>    <M-8> <Cmd>BufferGoto 8<CR>
+nnoremap <silent>    <M-9> <Cmd>BufferGoto 9<CR>
+nnoremap <silent>    <M-0> <Cmd>BufferLast<CR>
+
+" Pin/unpin buffer
+nnoremap <silent>    <M-z> <Cmd>BufferPin<CR>
+
+" Close buffer
+nnoremap <silent>    <M-q> <Cmd>BufferClose<CR>
+
+" Restore buffer
+nnoremap <silent>    <M-w> <Cmd>BufferRestore<CR>
+
+" Wipeout buffer
+"                          :BufferWipeout
+" Close commands
+"                          :BufferCloseAllButCurrent
+"                          :BufferCloseAllButVisible
+"                          :BufferCloseAllButPinned
+"                          :BufferCloseAllButCurrentOrPinned
+"                          :BufferCloseBuffersLeft
+"                          :BufferCloseBuffersRight
+
+" Magic buffer-picking mode
+nnoremap <silent> <M-f>    <Cmd>BufferPick<CR>
+nnoremap <silent> <C-p>    <Cmd>BufferPickDelete<CR>
+
+" Sort automatically by...
+nnoremap <silent> <Space>bb <Cmd>BufferOrderByBufferNumber<CR>
+nnoremap <silent> <Space>bd <Cmd>BufferOrderByDirectory<CR>
+nnoremap <silent> <Space>bl <Cmd>BufferOrderByLanguage<CR>
+nnoremap <silent> <Space>bw <Cmd>BufferOrderByWindowNumber<CR>
+
+" Other:
+" :BarbarEnable - enables barbar (enabled by default)
+" :BarbarDisable - very bad command, should never be used
+
+
diff --git a/dotfiles/.config/nvim/plugins.vim b/dotfiles/.config/nvim/plugins.vim
index 4d35c22..32707cf 100644
--- a/dotfiles/.config/nvim/plugins.vim
+++ b/dotfiles/.config/nvim/plugins.vim
@@ -238,6 +238,12 @@ Plug 'mkitt/tabline.vim'
 
 Plug 'prisma/vim-prisma'
 
+
+Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status
+Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons
+Plug 'romgrk/barbar.nvim'
+runtime plugconfig/barbar.vim
+
 "" LSP Support
 "Plug 'neovim/nvim-lspconfig'                           " Required
 "Plug 'williamboman/mason.nvim', {'do': ':MasonUpdate'} " Optional