|
@@ -10,7 +10,6 @@
|
|
|
, ripgrep
|
|
|
, html-tidy
|
|
|
, node-lsp
|
|
|
-, vimPlugins
|
|
|
, fetchFromGitHub
|
|
|
, fetchpatch
|
|
|
, withPlayground ? false
|
|
@@ -61,14 +60,6 @@ let
|
|
|
tsc
|
|
|
];
|
|
|
|
|
|
- nixpkgsPlugins =
|
|
|
- (lib.optionals withPlayground [
|
|
|
- vimPlugins.playground
|
|
|
- ])
|
|
|
- ++ (lib.optionals withLuadev [
|
|
|
- vimPlugins.nvim-luadev
|
|
|
- ]);
|
|
|
-
|
|
|
pinnedPlugins = import ./plugins {
|
|
|
inherit buildNeovimPlugin fetchFromGitHub fetchpatch;
|
|
|
};
|
|
@@ -77,11 +68,14 @@ let
|
|
|
inherit lib runCommand fetchFromGitHub tree-sitter;
|
|
|
};
|
|
|
|
|
|
- plugins = (lib.attrValues pinnedPlugins)
|
|
|
+ plugins = (builtins.filter (p: !p.optional) (lib.attrValues pinnedPlugins))
|
|
|
++ (lib.attrValues treesitterPlugins)
|
|
|
- ++ nixpkgsPlugins
|
|
|
++ [
|
|
|
extra-treesitter-textobjects
|
|
|
+ ] ++ lib.optionals withPlayground [
|
|
|
+ pinnedPlugins."nvim-treesitter/playground"
|
|
|
+ ] ++ lib.optionals withLuadev [
|
|
|
+ pinnedPlugins."bfredl/nvim-luadev"
|
|
|
];
|
|
|
|
|
|
generic = { initText ? "", enabledPlugins ? [], passthru ? {} }: stdenv.mkDerivation {
|