feat: add runtimeDeps support

CnTeng · Jan 19, 2025 · 07690ea · 07690ea
1 parent e97c3c8
commit 07690ea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/modules/module.nix b/modules/module.nix
@@ -56,7 +56,6 @@ let
     taplo
     libxml2
     nodePackages.prettier
-    xxd
   ];
 in
 {
@@ -89,5 +88,7 @@ in
     environment.systemPackages = [ cfg.finalPackage ] ++ languagesPkgs;
 
     environment.variables.EDITOR = mkIf cfg.defaultEditor "nvim";
+
+    environment.pathsToLink = [ "/share/nvim" ];
   };
 }
diff --git a/pkgs/rx-nvim/package.nix b/pkgs/rx-nvim/package.nix
@@ -10,7 +10,7 @@
 let
   plugins = callPackage ./plugins.nix { };
   configPath = ../../config;
-  inherit (plugins) pluginsPath extraLuaPackages;
+  inherit (plugins) pluginsPath runtimeDeps;
 
   parsersPath = symlinkJoin {
     name = "treesitter-parsers";
@@ -20,7 +20,6 @@ let
   neovimConfig = neovimUtils.makeNeovimConfig {
     autowrapRuntimeDeps = true;
     plugins = [ vimPlugins.lazy-nvim ];
-    inherit extraLuaPackages;
     luaRcContent = ''
       vim.g.config_path = "${configPath}"
       vim.g.plugins_path = "${pluginsPath}"
@@ -33,5 +32,9 @@ let
       ${extraConfig}
     '';
   };
+
+  nvim-wrapped = wrapNeovimUnstable neovim-unwrapped neovimConfig;
 in
-wrapNeovimUnstable neovim-unwrapped neovimConfig
+nvim-wrapped.overrideAttrs (old: {
+  runtimeDeps = old.runtimeDeps ++ runtimeDeps;
+})
diff --git a/pkgs/rx-nvim/plugins.nix b/pkgs/rx-nvim/plugins.nix
@@ -18,6 +18,13 @@ let
     in
     if lib.isDerivation plugin then [ (mkEntry plugin) ] ++ dependencies else [ plugin ];
 
+  mkRuntimeDeps =
+    plugins:
+    let
+      op = acc: plugin: acc ++ plugin.runtimeDeps or [ ];
+    in
+    lib.foldl' op [ ] plugins;
+
   plugins = with vimPlugins; [
     # code
     blink-cmp
@@ -39,10 +46,7 @@ let
     kulala-nvim
     lazydev-nvim
     markdown-preview-nvim
-    {
-      name = "lspkind.nvim";
-      path = lspkind-nvim;
-    }
+    lspkind-nvim
 
     # editor
     ultimate-autopair-nvim
@@ -91,10 +95,5 @@ let
 in
 {
   pluginsPath = linkFarm "lazy-plugins" (lib.concatMap mkLazyPlugin plugins);
-
-  extraLuaPackages =
-    p: with p; [
-      tiktoken_core
-      jsregexp
-    ];
+  runtimeDeps = mkRuntimeDeps plugins;
 }