diff --git a/config/keybindings.nix b/config/keybindings.nix
index e2da4b7..d5c6d56 100644
--- a/config/keybindings.nix
+++ b/config/keybindings.nix
@@ -18,7 +18,7 @@ in
     }
     {
       key = "<S-q>";
-      action = ":bdelete<CR>";
+      action = ":Bdelete<CR>";
       options = defaultOptions;
     }
     {
diff --git a/config/plugins/bufferline.nix b/config/plugins/bufferline.nix
new file mode 100644
index 0000000..f4c6198
--- /dev/null
+++ b/config/plugins/bufferline.nix
@@ -0,0 +1,12 @@
+{ ... }:
+{
+  plugins.bufferline = {
+    enable = true;
+    settings = {
+      options = {
+        close_command = "Bdelete! %d";
+        right_mouse_command = "Bdelete! %d";
+      };
+    };
+  };
+}
diff --git a/config/plugins/default.nix b/config/plugins/default.nix
index be3d86f..c7b0afd 100644
--- a/config/plugins/default.nix
+++ b/config/plugins/default.nix
@@ -10,12 +10,13 @@
     ./lsp.nix
     ./lualine.nix
     ./which-key.nix
+    ./bufferline.nix
+    ./neo-tree.nix
   ];
 
   plugins = {
-    neo-tree.enable = true;
+    bufdelete.enable = true;
     web-devicons.enable = true;
-    bufferline.enable = true;
     notify.enable = true;
     toggleterm.enable = true;
     treesitter = {
diff --git a/config/plugins/fzf-lua.nix b/config/plugins/fzf-lua.nix
index 2bc7eb0..92558d2 100644
--- a/config/plugins/fzf-lua.nix
+++ b/config/plugins/fzf-lua.nix
@@ -2,15 +2,13 @@
   ...
 }:
 let
-  mkMap =
-    action: desc:
-    {
-      inherit action;
-      options = {
-        silent = true;
-        inherit desc;
-      };
+  mkMap = action: desc: {
+    inherit action;
+    options = {
+      silent = true;
+      inherit desc;
     };
+  };
 in
 {
   plugins.fzf-lua = {
@@ -22,7 +20,7 @@ in
         width = 0.9;
       };
       # fzf_opts = {
-        # "--layout" = "reverse";
+      # "--layout" = "reverse";
       # };
       git_icons = true;
       defaults.file_icons = true;
diff --git a/config/plugins/neo-tree.nix b/config/plugins/neo-tree.nix
new file mode 100644
index 0000000..298acb2
--- /dev/null
+++ b/config/plugins/neo-tree.nix
@@ -0,0 +1,22 @@
+{ ... }:
+{
+  plugins.neo-tree = {
+    enable = true;
+    settings = {
+      close_if_last_window = true;
+      event_handlers = [
+        {
+          event = "neo_tree_window_after_close";
+          handler.__raw = ''
+            function(args)
+              local loc = require("neo-tree.ui.windows").get_location(args.position)
+              if loc and vim.api.nvim_win_is_valid(loc.winid) then
+                loc.winid = 0
+              end
+            end
+          '';
+        }
+      ];
+    };
+  };
+}