From bd4384a2e582ab7ea4dad709db3078e650506e09 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 18 Mar 2023 22:44:34 +0100 Subject: [PATCH] plugin/luasnip: Add jsregexp lua dependency (#274) The lua dependency is required to perform transforms (luasnip can fallback to a simpler algorithm if it's absent). This requires us to expose the `extraLuaPackages` option of makeNeovimConfig. --- modules/output.nix | 8 +++++++- plugins/snippets/luasnip/default.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/output.nix b/modules/output.nix index b20ab57d..3aee8a1c 100644 --- a/modules/output.nix +++ b/modules/output.nix @@ -103,6 +103,12 @@ in { readOnly = true; visible = false; }; + + extraLuaPackages = mkOption { + type = types.functionTo (types.listOf types.package); + description = "Extra lua packages to include with neovim"; + default = _: []; + }; }; config = let @@ -122,7 +128,7 @@ in { config.extraPlugins; neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({ - inherit (config) viAlias vimAlias; + inherit (config) viAlias vimAlias extraLuaPackages; # inherit customRC; plugins = normalizedPlugins; } diff --git a/plugins/snippets/luasnip/default.nix b/plugins/snippets/luasnip/default.nix index 605b4034..059277db 100644 --- a/plugins/snippets/luasnip/default.nix +++ b/plugins/snippets/luasnip/default.nix @@ -91,6 +91,7 @@ in { in mkIf cfg.enable { extraPlugins = [cfg.package]; + extraLuaPackages = ps: [ps.jsregexp]; extraConfigLua = concatStringsSep "\n" fromVscodeLoaders; }; }