diff --git a/user/config/nvim/default.nix b/user/config/nvim/default.nix
index 0e7ef9b..9ee5640 100644
--- a/user/config/nvim/default.nix
+++ b/user/config/nvim/default.nix
@@ -22,7 +22,19 @@
       tokyonight-nvim
       gitsigns-nvim
       neo-tree-nvim
-      undotree
+      bufferline-nvim
+      (pkgs.vimUtils.buildVimPlugin {
+        pname = "undotree";
+        version = "2024-2-9";
+        src = pkgs.fetchFromGitHub {
+          owner = "jiaoshijie";
+          repo = "undotree";
+          rev = "eab459ab87dd249617b5f7187bb69e614a083047";
+          sha256 = "sha256-FIYDyfkaIS9C16ClWKLMdpSPv/OrcOalVVsyFJBU2eI=";
+        };
+        meta.homepage = "https://github.com/jiaoshijie/undotree";
+        buildInputs = [plenary-nvim];
+      })
     ];
     extraPackages = with pkgs; [
       python3Packages.jedi-language-server
diff --git a/user/config/nvim/lua/u/bindings.lua b/user/config/nvim/lua/u/bindings.lua
index 287fb44..74ec995 100644
--- a/user/config/nvim/lua/u/bindings.lua
+++ b/user/config/nvim/lua/u/bindings.lua
@@ -1,7 +1,7 @@
 local map = vim.keymap.set
 map('n', '<esc>', '<cmd>nohlsearch<cr>')
 map('n', '<leader>t', '<cmd>Neotree toggle<cr>')
-map('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
+map('n', '<leader>u', require('undotree').toggle)
 map('n', 'H', '<cmd>bp<cr>')
 map('n', 'L', '<cmd>bn<cr>')
 map('n', '<leader>bd', '<cmd>bdelete<cr>')
diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua
index 7c288e5..0a87de4 100644
--- a/user/config/nvim/lua/u/plugins/init.lua
+++ b/user/config/nvim/lua/u/plugins/init.lua
@@ -27,4 +27,19 @@ require('mini.move').setup()
 require('mini.ai').setup()
 require('mini.jump2d').setup()
 require('mini.comment').setup()
-require('mini.tabline').setup()
+
+local bufferline = require('bufferline')
+bufferline.setup({
+  options = {
+    tab_size = 0,
+    indicator = {style = 'none'},
+    always_show_bufferline = false,
+    style_preset = bufferline.style_preset.no_italic,
+  }
+})
+
+require('undotree').setup({
+  window = {
+    winblend = 0
+  }
+})