diff --git a/neovim/lua/config/bufferline.lua b/neovim/lua/config/bufferline.lua
new file mode 100644
index 0000000..a7ac093
--- /dev/null
+++ b/neovim/lua/config/bufferline.lua
@@ -0,0 +1,24 @@
+require("bufferline").setup{
+  options = {
+    always_show_bufferline = true,
+    mode = "buffers",
+    color_icons = true,
+    show_buffer_icons = true,
+    show_buffer_close_icons = false,
+    show_buffer_default_icon = true,
+    show_close_icon = false,
+    show_tab_indicators = true,
+    separator_style = "slant",
+    diagnostics = "nvim_lsp",
+    diagnostics_update_in_insert = true,
+    diagnostics_indicator = function(count, level, diagnostics_dict, context)
+      local s = ""
+      for e, n in pairs(diagnostics_dict) do
+        local sym = e == "error" and " "
+          or (e == "warning" and " " or "" )
+        s = s .. n .. sym
+      end
+      return s
+    end
+  }
+}
diff --git a/neovim/lua/plugins.lua b/neovim/lua/plugins.lua
index adbed3e..ddaabb7 100644
--- a/neovim/lua/plugins.lua
+++ b/neovim/lua/plugins.lua
@@ -14,4 +14,11 @@ return require("packer").startup(function(use)
     config = require("config.treesitter"),
     run    = ":TSUpdate",
   }
+
+  use {
+    "akinsho/bufferline.nvim",
+    requires = 'kyazdani42/nvim-web-devicons',
+    config   = require("config.bufferline"),
+  }
+
 end)