Skip to content

modules/output: obtain plugin configs from wrapped neovim #2414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 3 commits into from
Oct 13, 2024
Merged

modules/output: obtain plugin configs from wrapped neovim #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21f7ed6
tests/modules/output: test that init.lua contains all config sections
stasjok Oct 13, 2024
ba77e88
modules/output: remove unused binding
stasjok Oct 13, 2024
767eb62
modules/output: obtain plugin configs from wrapped neovim
stasjok Oct 13, 2024
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
20 changes: 11 additions & 9 deletions modules/top-level/output.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}:
let
inherit (lib) types mkOption mkPackageOption;
inherit (lib) optional optionalString optionalAttrs;
inherit (lib) optional optionalAttrs;
builders = lib.nixvim.builders.withPkgs pkgs;
in
{
Expand Down Expand Up @@ -285,8 +285,10 @@ in
}
);

wrappedNeovim' = pkgs.wrapNeovimUnstable package neovimConfig;

customRC = helpers.concatNonEmptyLines [
(helpers.wrapVimscriptForLua neovimConfig.neovimRcContent)
(helpers.wrapVimscriptForLua wrappedNeovim'.initRc)
config.content
];

Expand Down Expand Up @@ -330,13 +332,13 @@ in
else
config.package;

wrappedNeovim = pkgs.wrapNeovimUnstable package (
neovimConfig
// {
wrapperArgs = lib.escapeShellArgs neovimConfig.wrapperArgs + " " + extraWrapperArgs;
wrapRc = false;
}
);
wrappedNeovim = wrappedNeovim'.override (prev: {
wrapperArgs =
(if lib.isString prev.wrapperArgs then prev.wrapperArgs else lib.escapeShellArgs prev.wrapperArgs)
+ " "
+ extraWrapperArgs;
wrapRc = false;
});
in
{
build = {
Expand Down
24 changes: 19 additions & 5 deletions tests/test-sources/modules/output.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,27 @@
"test.vim" = configs;
};

# Plugin configs
# TODO: Test this makes it to the nvim configuration
# NOTE: config.content currently does not contain extraPlugins config
extraPlugins = [
{
plugin = pkgs.emptyDirectory;
config = "let g:var = 'neovimRcContent5'";
config = "let g:var = 'wrappedNeovim.initRc5'";

# Test that final init.lua contains all config sections
plugin = pkgs.runCommandLocal "init-lua-content-test" { } ''
test_content() {
if ! grep -qF "$1" "${config.build.initFile}"; then
echo "init.lua should contain $2" >&2
exit 1
fi
}

test_content extraConfigLuaPre1 extraConfigLuaPre
test_content extraConfigLua2 extraConfigLua
test_content extraConfigLuaPost3 extraConfigLuaPost
test_content extraConfigVim4 extraConfigVim4
test_content wrappedNeovim.initRc5 wrappedNeovim.initRc

touch $out
'';
}
];

Expand Down