diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index edf90e62..04e0eb64 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -306,12 +306,12 @@
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
 - Add catppuccin integration for Bufferline, Lspsaga.
-- Add `neo-tree`, `snacks.explorer` integrations to `bufferline`.
+- Add neo-tree integration for Bufferline.
 - Add more applicable filetypes to illuminate denylist.
 - Disable mini.indentscope for applicable filetypes.
 - Fix fzf-lua having a hard dependency on fzf.
 - Enable inlay hints support - `config.vim.lsp.inlayHints`.
-- Add `neo-tree`, `snacks.picker` extensions to `lualine`.
+- Add `neo-tree` extension to `lualine`.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix
index ba02df9c..3a10bac7 100644
--- a/modules/plugins/lsp/null-ls/null-ls.nix
+++ b/modules/plugins/lsp/null-ls/null-ls.nix
@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) listOf str int nullOr;
+  inherit (lib.types) attrsOf str int nullOr;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) luaInline mkPluginSetupOption;
   inherit (lib.nvim.config) batchRenameOptions;
@@ -70,7 +70,7 @@ in {
       };
 
       sources = mkOption {
-        type = nullOr (listOf luaInline);
+        type = nullOr (attrsOf luaInline);
         default = null;
         description = "Sources for null-ls to register";
       };
diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
index 89dcbbe5..b8334bfd 100644
--- a/modules/plugins/statusline/lualine/config.nix
+++ b/modules/plugins/statusline/lualine/config.nix
@@ -14,28 +14,17 @@
   bCfg = config.vim.ui.breadcrumbs;
 in {
   config = mkMerge [
-    {
-      vim.statusline.lualine.setupOpts.extensions =
-        (lib.optionals config.vim.filetree.nvimTree.enable ["nvim-tree"])
-        ++ (lib.optionals config.vim.filetree.neo-tree.enable ["neo-tree"])
-        ++ (lib.optionals config.vim.utility.snacks-nvim.enable [
-          {
-            # same extensions as nerdtree / neo-tree
-            # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/nerdtree.lua
-            # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/neo-tree.lua
-            sections = {
-              lualine_a = mkLuaInline ''
-                {
-                  function()
-                    return vim.fn.fnamemodify(vim.fn.getcwd(), ":~")
-                  end,
-                }
-              '';
-            };
-            filetypes = ["snacks_picker_list" "snacks_picker_input"];
-          }
-        ]);
-    }
+    (mkIf config.vim.filetree.nvimTree.enable {
+      vim.statusline.lualine.setupOpts = {
+        extensions = ["nvim-tree"];
+      };
+    })
+
+    (mkIf config.vim.filetree.neo-tree.enable {
+      vim.statusline.lualine.setupOpts = {
+        extensions = ["neo-tree"];
+      };
+    })
 
     (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
       vim.statusline.lualine.setupOpts = {
diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
index 14243670..997c9ba3 100644
--- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -272,12 +272,20 @@ in {
 
         offsets = mkOption {
           type = listOf attrs;
-          default = map (filetype: {
-            inherit filetype;
-            text = "File Explorer";
-            highlight = "Directory";
-            separator = true;
-          }) ["NvimTree" "neo-tree" "snacks_layout_box"];
+          default = [
+            {
+              filetype = "NvimTree";
+              text = "File Explorer";
+              highlight = "Directory";
+              separator = true;
+            }
+            {
+              filetype = "neo-tree";
+              text = "File Explorer";
+              highlight = "Directory";
+              separator = true;
+            }
+          ];
           description = "The windows to offset bufferline above, see `:help bufferline-offset`";
         };