diff --git a/init.lua b/init.lua
index 4b32af9..4b1833d 100644
--- a/init.lua
+++ b/init.lua
@@ -51,3 +51,5 @@ end
 
 -- setup lsp
 require("config.lsp")
+-- render bufferline
+require("bufferline").setup{}
diff --git a/lazy-lock.json b/lazy-lock.json
index 8d87913..e5fa6a8 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,6 +2,7 @@
   "PDFview": { "branch": "main", "commit": "972dfcce5c0de578865649940f44bf57a700498d" },
   "base16-nvim": { "branch": "master", "commit": "190397833e53fdfd5cf400c5baaf1a4e533158e5" },
   "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fd": { "branch": "master", "commit": "9d137d358df10c441e51dcacc5899e43a4bee877" },
   "fzf-lua": { "branch": "main", "commit": "8a79ee54d6216d10b2f153921a12b152be0c1a20" },
@@ -36,6 +37,7 @@
   "sudo.nvim": { "branch": "main", "commit": "eed34f8636f0dd1bac89c81f6f96a86ca513f5f2" },
   "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
   "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
diff --git a/lua/plugins/.#trouble.lua b/lua/plugins/.#trouble.lua
deleted file mode 120000
index 48b79d4..0000000
--- a/lua/plugins/.#trouble.lua
+++ /dev/null
@@ -1 +0,0 @@
-venus@fw16-btw.84990:1774329150
\ No newline at end of file
diff --git a/lua/plugins/lazy-plugins.lua b/lua/plugins/lazy-plugins.lua
index 28b4792..9ecbfe1 100644
--- a/lua/plugins/lazy-plugins.lua
+++ b/lua/plugins/lazy-plugins.lua
@@ -46,19 +46,4 @@ return {
       },
     },
   },
-  {
-    "folke/todo-comments.nvim", -- find and list all TODO comments
-    cmd = { "TodoTrouble", "TodoTelescope" },
-    event = "LazyFile",
-    opts = {},
-    -- stylua: ignore
-    keys = {
-      { "]t", function() require("todo-comments").jump_next() end, desc = "Next Todo Comment" },
-      { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous Todo Comment" },
-      { "<leader>xt", "<cmd>Trouble todo toggle<cr>", desc = "Todo (Trouble)" },
-      { "<leader>xT", "<cmd>Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
-      { "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" },
-      { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
-    },
-  },
 }
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index d9106d7..5ba8acf 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -1,64 +1,89 @@
 return { -- adds more detailed bar below the pane
+  {
   'nvim-lualine/lualine.nvim',
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   config = function()
   require('lualine').setup {
-  options = {
-    icons_enabled = true,
-    theme = 'auto',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
-    disabled_filetypes = {
-      statusline = {},
-      winbar = {},
-    },
-    ignore_focus = {},
-    always_divide_middle = true,
-    always_show_tabline = true,
-    globalstatus = false,
-    refresh = {
-      statusline = 1000,
-      tabline = 1000,
-      winbar = 1000,
-      refresh_time = 16, -- ~60fps
-      events = {
-        'WinEnter',
-        'BufEnter',
-        'BufWritePost',
-        'SessionLoadPost',
-        'FileChangedShellPost',
-        'VimResized',
-        'Filetype',
-        'CursorMoved',
-        'CursorMovedI',
-        'ModeChanged',
+    options = {
+      icons_enabled = true,
+      theme = 'auto',
+      component_separators = { left = '', right = ''},
+      section_separators = { left = '', right = ''},
+      disabled_filetypes = {
+        statusline = {},
+        winbar = {},
       },
+      ignore_focus = {},
+      always_divide_middle = true,
+      always_show_tabline = true,
+      globalstatus = false,
+      refresh = {
+        statusline = 1000,
+        tabline = 1000,
+        winbar = 1000,
+        refresh_time = 16, -- ~60fps
+        events = {
+          'WinEnter',
+          'BufEnter',
+          'BufWritePost',
+          'SessionLoadPost',
+          'FileChangedShellPost',
+          'VimResized',
+          'Filetype',
+          'CursorMoved',
+          'CursorMovedI',
+          'ModeChanged',
+        },
+      }
+    },
+    sections = {
+      lualine_a = {'mode', 'lsp_status'},
+      lualine_b = {'branch', 'diff', 'diagnostics'},
+      lualine_c = {'filename'},
+      -- lualine_d = {'tabs', 'windows'},
+      lualine_x = {'searchcount', 'selectioncount', 'fileformat', 'filetype'},
+      lualine_y = {'progress', 'location'},
+      lualine_z = {{'datetime', style = "%m/%d %H:%M"}}
+    },
+    inactive_sections = {
+      lualine_a = {},
+      lualine_b = {},
+      lualine_c = {'filename'},
+      lualine_x = {'location'},
+      lualine_y = {},
+      lualine_z = {}
+    },
+    tabline = {
+      -- lualine_a = {'filename'}
+    },
+    winbar = {},
+    inactive_winbar = {},
+    extensions = {}
     }
+  end
   },
-  sections = {
-    lualine_a = {'mode', 'lsp_status'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    -- lualine_d = {'tabs', 'windows'},
-    lualine_x = {'searchcount', 'selectioncount', 'fileformat', 'filetype'},
-    lualine_y = {'progress', 'location'},
-    lualine_z = {{'datetime', style = "%m/%d %H:%M"}}
+  {
+    'akinsho/bufferline.nvim',
+    version = "*",
+    dependencies = 'nvim-tree/nvim-web-devicons',
+    config = function()
+      local bufferline = require('bufferline')
+      bufferline.setup{
+        themable = true,
+        numbers = "buffer_id",
+        indicator = {
+            icon = '▎', -- this should be omitted if indicator style is not 'icon'
+            style = 'icon',
+        },
+        buffer_close_icon = '󰅖',
+        modified_icon = '● ',
+        close_icon = ' ',
+        left_trunc_marker = ' ',
+        right_trunc_marker = ' ',
+        diagnostics = "nvim_lsp",
+
+      }
+    end
   },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-  tabline = {
-    -- lualine_a = {'filename'}
-  },
-  winbar = {},
-  inactive_winbar = {},
-  extensions = {}
-}
-end
 }