diff --git a/lua/plugins/configs/bufferline.lua b/lua/plugins/configs/bufferline.lua
new file mode 100644
index 0000000..30457b9
--- /dev/null
+++ b/lua/plugins/configs/bufferline.lua
@@ -0,0 +1,30 @@
+local bufferline = require("bufferline")
+
+bufferline.setup({
+	options = {
+		numbers = "ordinal",
+		close_command = "Bdelete! %d",
+		right_mouse_command = "Bdelete! %d",
+		left_mouse_command = "buffer %d",
+		middle_mouse_command = nil,
+		buffer_close_icon = "",
+		modified_icon = "●",
+		close_icon = "",
+		left_trunc_marker = "",
+		right_trunc_marker = "",
+		max_name_length = 30,
+		max_prefix_length = 30,
+		tab_size = 21,
+		diagnostics = "nvim_lsp",
+		diagnostics_update_in_insert = true,
+		show_buffer_icons = true,
+		show_buffer_close_icons = true,
+		show_close_icon = true,
+		show_tab_indicators = true,
+		persist_buffer_sort = true,
+		separator_style = "thin",
+		enforce_regular_tabs = true,
+		always_show_bufferline = true,
+	},
+})
+
diff --git a/lua/plugins/configs/lsp/init.lua b/lua/plugins/configs/lsp/init.lua
index 95f2cb6..56da003 100644
--- a/lua/plugins/configs/lsp/init.lua
+++ b/lua/plugins/configs/lsp/init.lua
@@ -5,3 +5,4 @@ require("plugins.configs.lsp.mason")
 require("plugins.configs.lsp.lspsaga")
 require("plugins.configs.lsp.signature")
 require("plugins.configs.lsp.lsplines")
+require("plugins.configs.lsp.manual")
diff --git a/lua/plugins/configs/lsp/manual.lua b/lua/plugins/configs/lsp/manual.lua
new file mode 100644
index 0000000..a9719ee
--- /dev/null
+++ b/lua/plugins/configs/lsp/manual.lua
@@ -0,0 +1,3 @@
+local lspconfig = require("lspconfig")
+
+lspconfig.sumneko_lua.setup({})
diff --git a/lua/plugins/configs/lualine.lua b/lua/plugins/configs/lualine.lua
index 6ec554d..7dd3e1c 100644
--- a/lua/plugins/configs/lualine.lua
+++ b/lua/plugins/configs/lualine.lua
@@ -25,12 +25,4 @@ lualine.setup({
 		lualine_y = {},
 		lualine_z = { "location" },
 	},
-	tabline = {
-		lualine_a = { "buffers" },
-		lualine_b = {},
-		lualine_c = {},
-		lualine_x = {},
-		lualine_y = {},
-		lualine_z = { "tabs" },
-	},
 })
diff --git a/lua/plugins/packer.lua b/lua/plugins/packer.lua
index d28d44e..0e9681d 100644
--- a/lua/plugins/packer.lua
+++ b/lua/plugins/packer.lua
@@ -240,7 +240,6 @@ return packer.startup(function(use)
 	-- Statusline
 	use({
 		"nvim-lualine/lualine.nvim",
-		event = "BufReadPre",
 		config = function()
 			require("plugins.configs.lualine")
 		end,
@@ -278,7 +277,6 @@ return packer.startup(function(use)
 			require("plugins.configs.rust-tools")
 		end,
 	})
-
 	use({
 		"Saecki/crates.nvim",
 		event = { "BufRead Cargo.toml" },
@@ -287,6 +285,19 @@ return packer.startup(function(use)
 		end,
 	})
 
+	-- Bufferline
+	use({
+		"akinsho/bufferline.nvim",
+		config = function()
+			require("plugins.configs.bufferline")
+		end
+	})
+	use({
+		"moll/vim-bbye",
+		after = "bufferline.nvim"
+	})
+
+
 	if PACKER_BOOTSTRAP then
 		require("packer").sync()
 	end