diff --git a/pkgs/bck-nvim/default.nix b/pkgs/bck-nvim-base/default.nix
similarity index 69%
rename from pkgs/bck-nvim/default.nix
rename to pkgs/bck-nvim-base/default.nix
index 7068b90..1d3d5d2 100644
--- a/pkgs/bck-nvim/default.nix
+++ b/pkgs/bck-nvim-base/default.nix
@@ -1,17 +1,8 @@
 { lib
+, extraBinPaths ? [ ]
 , neovim-unwrapped
 , vimPlugins
 , wrapNeovim
-
-  # LSP
-, black
-, efm-langserver
-, lua-language-server
-, nil
-, nodePackages
-, pyright
-, vscode-langservers-extracted
-, yaml-language-server
 }:
 
 let
@@ -22,17 +13,7 @@ let
 
   extraPath = lib.concatLines (map
     (p: "let $PATH .= ':${p}/bin'")
-    [
-      black
-      efm-langserver
-      lua-language-server
-      nil
-      nodePackages.prettier
-      nodePackages.typescript-language-server
-      pyright
-      vscode-langservers-extracted
-      yaml-language-server
-    ]
+    (extraBinPaths)
   );
 
 in
diff --git a/pkgs/bck-nvim/lua/1-nvimtree.lua b/pkgs/bck-nvim-base/lua/1-nvimtree.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/1-nvimtree.lua
rename to pkgs/bck-nvim-base/lua/1-nvimtree.lua
diff --git a/pkgs/bck-nvim/lua/2-lualine.lua b/pkgs/bck-nvim-base/lua/2-lualine.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/2-lualine.lua
rename to pkgs/bck-nvim-base/lua/2-lualine.lua
diff --git a/pkgs/bck-nvim/lua/4-cmp.lua b/pkgs/bck-nvim-base/lua/4-cmp.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/4-cmp.lua
rename to pkgs/bck-nvim-base/lua/4-cmp.lua
diff --git a/pkgs/bck-nvim/lua/5-lsp.lua b/pkgs/bck-nvim-base/lua/5-lsp.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/5-lsp.lua
rename to pkgs/bck-nvim-base/lua/5-lsp.lua
diff --git a/pkgs/bck-nvim/lua/8-other-plugins.lua b/pkgs/bck-nvim-base/lua/8-other-plugins.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/8-other-plugins.lua
rename to pkgs/bck-nvim-base/lua/8-other-plugins.lua
diff --git a/pkgs/bck-nvim/lua/9-misc.lua b/pkgs/bck-nvim-base/lua/9-misc.lua
similarity index 100%
rename from pkgs/bck-nvim/lua/9-misc.lua
rename to pkgs/bck-nvim-base/lua/9-misc.lua
diff --git a/pkgs/bck-nvim-tools.nix b/pkgs/bck-nvim-tools.nix
new file mode 100644
index 0000000..5041cd4
--- /dev/null
+++ b/pkgs/bck-nvim-tools.nix
@@ -0,0 +1,25 @@
+{ symlinkJoin
+, black
+, efm-langserver
+, lua-language-server
+, nil
+, nodePackages
+, pyright
+, vscode-langservers-extracted
+, yaml-language-server
+}:
+
+symlinkJoin {
+  name = "bck-nvim-tools";
+  paths = [
+    black
+    efm-langserver
+    lua-language-server
+    nil
+    nodePackages.prettier
+    nodePackages.typescript-language-server
+    pyright
+    vscode-langservers-extracted
+    yaml-language-server
+  ];
+}
diff --git a/pkgs/bck-nvim.nix b/pkgs/bck-nvim.nix
new file mode 100644
index 0000000..a443641
--- /dev/null
+++ b/pkgs/bck-nvim.nix
@@ -0,0 +1,7 @@
+{ callPackage }:
+
+callPackage ./bck-nvim-base {
+  extraBinPaths = [
+    (callPackage ./bck-nvim-tools.nix { })
+  ];
+}