Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions modules/programs/neovim.nix
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,26 @@ in
advisedLua = foldedLuaBlock "home-manager generated: plugin config advised in nixpkgs" (
lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua
);

generatedLuaPath = lib.concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages;
generatedLuaCPath = lib.concatMapStringsSep ";" luaPackages.getLuaCPath resolvedExtraLuaPackages;
in

lib.mkMerge [
(lib.mkIf (
resolvedExtraLuaPackages != [ ]
) ''package.path = "${generatedLuaPath}".. ";" .. package.path'')
(lib.mkIf (
resolvedExtraLuaPackages != [ ]
) ''package.cpath = "${generatedLuaCPath}".. ";" .. package.cpath'')
(lib.mkIf (advisedLua != null) (lib.mkOrder 510 advisedLua))
(lib.mkIf (wrappedNeovim'.initRc != "") (
lib.mkBefore "vim.cmd [[source ${pkgs.writeText "nvim-init-home-manager.vim" wrappedNeovim'.initRc}]]"
))
(lib.mkIf (lib.hasAttr "lua" cfg.generatedConfigs) (
lib.mkAfter (foldedLuaBlock "user-associated plugin config" cfg.generatedConfigs.lua)
))

];

# link the packpath in expected folder so that even unwrapped neovim can pick
Expand Down
2 changes: 2 additions & 0 deletions tests/modules/programs/neovim/plugin-config.expected
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
vim.cmd [[source /nix/store/00000000000000000000000000000000-nvim-init-home-manager.vim]]
package.path = "/nix/store/00000000000000000000000000000000-luajit2.1-luautf8/share/lua/5.1/?.lua;/nix/store/00000000000000000000000000000000-luajit2.1-luautf8/share/lua/5.1/?/init.lua".. ";" .. package.path
package.cpath = "/nix/store/00000000000000000000000000000000-luajit2.1-luautf8/lib/lua/5.1/?.so".. ";" .. package.cpath
-- user-associated plugin config {{{
function HM_PLUGIN_LUA_CONFIG ()
end
Expand Down