From 4811c8054c1ff6ec99aa4952299d32ad6e9c17ee Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Thu, 17 Nov 2022 23:44:45 +0300 Subject: [PATCH] use only plugins from flake config --- default.nix | 6 +++--- flake.nix | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 59bf968..933b3c7 100644 --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ , wrapNeovim , neovim-unwrapped , tree-sitter -, vimPlugins +, neovimPlugins , lib , ... }: @@ -18,7 +18,7 @@ let inherit (builtins) catAttrs isFunction readFile; myLib = import ./lib.nix { inherit lib; }; - pluginParams = vimPlugins // { + pluginParams = neovimPlugins // { inherit tree-sitter grammarFileTypes; inherit enableDevIcons enableTabby enableOrgMode; themeCfg = theme; @@ -40,7 +40,7 @@ let ./plugins/ux ]; - basePlugins = [ vimPlugins.plenary-nvim ]; + basePlugins = [ neovimPlugins.plenary-nvim ]; customPlugins = catAttrs "plugins" plugins; allPlugins = basePlugins ++ customPlugins; diff --git a/flake.nix b/flake.nix index ddbf7cf..3d176b6 100644 --- a/flake.nix +++ b/flake.nix @@ -212,11 +212,9 @@ buildPluginValuePair = n: nameValuePair n (buildPlugin n); - customPlugins = (listToAttrs (map buildPluginValuePair inputPlugins)); + neovimPlugins = (listToAttrs (map buildPluginValuePair inputPlugins)); in - { - vimPlugins = vimPlugins // customPlugins; - }; + { inherit neovimPlugins; }; in { overlays = {