diff --git a/init.lua b/init.lua
index 8d68d4c..91d8c1c 100644
--- a/init.lua
+++ b/init.lua
@@ -700,23 +700,31 @@ require('lazy').setup({
 			let g:airline_symbols.notexists = '?'            " Symbol for untracked file
 		]]
 	end},
-	{'romgrk/barbar.nvim', lazy = false, keys = {
-		{'<A-,>', '<Cmd>BufferPrevious<CR>', { desc = 'Next buffer' }},
-		{'<A-.>', '<Cmd>BufferNext<CR>', { desc = 'Previous buffer' }},
-		{'<A-b>', '<Cmd>BufferPick<CR>', { desc = 'Pick buffer' }},
-		{'<A-p>', '<Cmd>BufferPin<CR>', { desc = 'Pin buffer' }},
-		{'<A-d>', '<Cmd>BufferClose<CR>', { desc = 'Delete buffer' }},
-		{'<A-x>', '<Cmd>BufferPickDelete<CR>', { desc = 'Delete picked buffer' }},
-		{'<A-<>', '<Cmd>BufferMovePrevious<CR>', { desc = 'Move buffer left' }},
-		{'<A->>', '<Cmd>BufferMoveNext<CR>', { desc = 'Move buffer right' }},
-		{'<Leader>b,', '<Cmd>BufferPrevious<CR>', { desc = 'Next buffer' }},
-		{'<Leader>b.', '<Cmd>BufferNext<CR>', { desc = 'Previous buffer' }},
-		{'<Leader>bb', '<Cmd>BufferPick<CR>', { desc = 'Pick buffer' }},
-		{'<Leader>bp', '<Cmd>BufferPin<CR>', { desc = 'Pin buffer' }},
-		{'<Leader>bd', '<Cmd>BufferClose<CR>', { desc = 'Delete buffer' }},
-		{'<Leader>bx', '<Cmd>BufferPickDelete<CR>', { desc = 'Delete picked buffer' }},
-		{'<Leader>bh', '<Cmd>BufferMovePrevious<CR>', { desc = 'Move buffer left' }},
-		{'<Leader>bl', '<Cmd>BufferMoveNext<CR>', { desc = 'Move buffer right' }},
+	{'akinsho/bufferline.nvim', lazy = false, opts = {
+		options = {
+			diagnostics = 'nvim_lsp',
+			themable = true,
+			hover = {
+				enabled = true,
+			},
+		},
+	}, keys = {
+		{'<A-,>', '<Cmd>BufferLineCyclePrev<CR>', { desc = 'Next buffer' }},
+		{'<A-.>', '<Cmd>BufferLineCycleNext<CR>', { desc = 'Previous buffer' }},
+		{'<A-b>', '<Cmd>BufferLinePick<CR>', { desc = 'Pick buffer' }},
+		{'<A-p>', '<Cmd>BufferLineTogglePin<CR>', { desc = 'Pin buffer' }},
+		{'<A-d>', '<Cmd>BufDel<CR>', { desc = 'Delete buffer' }},
+		{'<A-x>', '<Cmd>BufferLinePickClose<CR>', { desc = 'Delete picked buffer' }},
+		{'<A-<>', '<Cmd>BufferLineMovePrevious<CR>', { desc = 'Move buffer left' }},
+		{'<A->>', '<Cmd>BufferLineMoveNext<CR>', { desc = 'Move buffer right' }},
+		{'<Leader>b,', '<Cmd>BufferLineCyclePrev<CR>', { desc = 'Next buffer' }},
+		{'<Leader>b.', '<Cmd>BufferLineCycleNext<CR>', { desc = 'Previous buffer' }},
+		{'<Leader>bb', '<Cmd>BufferLinePick<CR>', { desc = 'Pick buffer' }},
+		{'<Leader>bp', '<Cmd>BufferLineTogglePin<CR>', { desc = 'Pin buffer' }},
+		{'<Leader>bd', '<Cmd>BufDel<CR>', { desc = 'Delete buffer' }},
+		{'<Leader>bx', '<Cmd>BufferLinePickClose<CR>', { desc = 'Delete picked buffer' }},
+		{'<Leader>bh', '<Cmd>BufferLineMovePrev<CR>', { desc = 'Move buffer left' }},
+		{'<Leader>bl', '<Cmd>BufferLineMoveNext<CR>', { desc = 'Move buffer right' }},
 	}},
 	{'luckasRanarison/clear-action.nvim', config = function()
 		require'clear-action'.setup {