diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 772231ec..41fe6662 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -14,6 +14,7 @@ require "nvim-tree-cfg"
 require "startup-cfg"
 require "nvim-autopairs-cfg"
 require "nvim-colorizer-cfg"
+require "barbar-cfg"
 
 require "mason-cfg"
 require "lsp-cfg"
diff --git a/.config/nvim/lua/barbar-cfg/init.lua b/.config/nvim/lua/barbar-cfg/init.lua
new file mode 100644
index 00000000..6a92fd61
--- /dev/null
+++ b/.config/nvim/lua/barbar-cfg/init.lua
@@ -0,0 +1,34 @@
+vim.g.bufferline = {
+	animation = true,
+	tabpages = true,
+	clickable = true,
+	icon_pinned = '',
+}
+
+
+local map = vim.api.nvim_set_keymap
+local opts = { noremap = true, silent = true }
+-- Move to previous/next
+map('n', 'gT', '<Cmd>BufferPrevious<CR>', opts)
+map('n', 'gt', '<Cmd>BufferNext<CR>', opts)
+map('n', '<A-{>', '<Cmd>BufferPrevious<CR>', opts)
+map('n', '<A-}>', '<Cmd>BufferNext<CR>', opts)
+
+-- Re-order to previous/next
+map('n', '<C-{>', '<Cmd>BufferMovePrevious<CR>', opts)
+map('n', '<C-}>', '<Cmd>BufferMoveNext<CR>', opts)
+
+-- Goto buffer in position...
+map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
+map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
+map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
+map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
+map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
+map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
+map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
+map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
+map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
+map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
+
+-- Pin/unpin buffer
+map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
diff --git a/.config/nvim/lua/lsp-cfg/init.lua b/.config/nvim/lua/lsp-cfg/init.lua
index 1468d41a..22e453a6 100644
--- a/.config/nvim/lua/lsp-cfg/init.lua
+++ b/.config/nvim/lua/lsp-cfg/init.lua
@@ -26,9 +26,6 @@ local on_attach = function(_, bufnr)
 	vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
 	vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
 
-	-- vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-	-- 	vim.lsp.buf.format()
-	-- end, { desc = 'Format current buffer with LSP' })
 end
 
 local capabilities = vim.lsp.protocol.make_client_capabilities()
diff --git a/.config/nvim/lua/packer-cfg/init.lua b/.config/nvim/lua/packer-cfg/init.lua
index c7cfbf5c..82a5ebf4 100644
--- a/.config/nvim/lua/packer-cfg/init.lua
+++ b/.config/nvim/lua/packer-cfg/init.lua
@@ -19,6 +19,7 @@ require "packer".startup(function(use)
 	use "nvim-tree/nvim-tree.lua"
 	use "windwp/nvim-autopairs"
 	use "norcalli/nvim-colorizer.lua"
+	use { "romgrk/barbar.nvim", requires = { "kyazdani42/nvim-web-devicons" } }
 
 	use { "nvim-telescope/telescope.nvim", branch = "0.1.x", requires = { "nvim-lua/plenary.nvim" } }
 	use { "nvim-telescope/telescope-fzf-native.nvim", run = "make", cond = vim.fn.executable "make" == 1 }