From 3d2d2cc7272d7a5f054f5098ff3f33f6d9df30a0 Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish.lakhwara@cubiko.com.au>
Date: Wed, 9 Mar 2022 14:24:34 +1000
Subject: [PATCH] barbar cooler than bufferline, fix fucking dashboard nvims
 horrible default remap

---
 profiles/nvim/nvim.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix
index 89eebee5..604a4f98 100644
--- a/profiles/nvim/nvim.nix
+++ b/profiles/nvim/nvim.nix
@@ -64,7 +64,6 @@ in
 				undotree
 				telescope-nvim
 				plenary-nvim
-				bufferline-nvim
 				lualine-nvim
 				nvim-gps
 				nvim-treesitter
@@ -72,6 +71,7 @@ in
 				cmp-treesitter
 				dashboard-nvim
 				FTerm-nvim
+        barbar-nvim
 
 				# kitaab stuff
 				vimwiki
@@ -229,12 +229,18 @@ in
 			:vmap <leader>sy "*y
 			:map <leader>sp :r!xclip -o<CR>
 
+      " barbar
+      nnoremap <silet> gT :BufferPrevious<CR>
+      nnoremap <silet> gt :BufferNext<CR>
+      nnoremap <silet> gj :BufferPick<CR>
+      nnoremap <silet> gc :BufferClose<CR>
+
 			" git
 			nnoremap <leader>ga :G fetch --all
 			nmap <leader>gs :G<CR>
 			nmap <leader>gh :diffget //3
 			nmap <leader>gl :diffget //2
-			nmap <leader>gc :GCheckout<CR>
+			nmap <leader>gc :GBranches<CR>
 			nnoremap <leader>gp :G push<CR>
 
 			" kitaab
@@ -249,8 +255,9 @@ in
 			nnoremap <silent> <Leader>fh :DashboardFindHistory<CR>
 			nnoremap <silent> <Leader>ff :DashboardFindFile<CR>
 			nnoremap <silent> <Leader>fa :DashboardFindWord<CR>
-			nnoremap <silent> <Leader>fb :DashboardJumpMark<CR>
+			nnoremap <silent> <Leader>fm :DashboardJumpMark<CR>
 			nnoremap <silent> <Leader>cn :DashboardNewFile<CR>
+			nnoremap <silent> <Leader>tn :tabnew<CR>
 			autocmd FileType dashboard set showtabline=0 | autocmd WinLeave <buffer> set showtabline=2 
 
 			" fzf
@@ -268,11 +275,6 @@ in
 			nnoremap <leader>vn :lua vim.lsp.diagnostic.goto_next()<CR>
 			nnoremap <leader>vll :call LspLocationList()<CR>
 
-			"bufferline 
-			" These commands will navigate through buffers in order regardless of which mode you are using
-			nnoremap <silent>gt :BufferLineCycleNext<CR>
-			nnoremap <silent>gT :BufferLineCyclePrev<CR>
-
 			" lua config 
 			lua <<EOF
 -- autopairs
@@ -353,8 +355,6 @@ require('lspconfig').rnix.setup {}
 require('lspconfig').pylsp.setup {}
 require('lspconfig').terraform_lsp.setup {}
 
--- Bufferline
-require('bufferline').setup {}
 require('gitsigns').setup { sign_priority=80 }
 
 -- treesitter