NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-02 00:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #237 from FrothyMarrow/unstable-wrapper

Browse source 
wrapper: migrate to `makeNeovimUnstable` wrapper
This commit is contained in:
raf 2024-03-01 16:44:02 +03:00 • committed by GitHub
commit 2ea98f643b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/default.nix
View file

@ -6,8 +6,9 @@ inputs: {
extraSpecialArgs ? {},
}: let
inherit (builtins) map filter isString toString getAttr;
inherit (pkgs) wrapNeovim vimPlugins;
inherit (pkgs) wrapNeovimUnstable vimPlugins;
inherit (pkgs.vimUtils) buildVimPlugin;
inherit (pkgs.neovimUtils) makeNeovimConfig;
extendedLib = import ../lib/stdlib-extended.nix lib;
@ -57,21 +58,22 @@ inputs: {
(f: f != null)
plugins);
neovim = wrapNeovim vimOptions.package {
plugins =
(buildConfigPlugins vimOptions.startPlugins)
++ (map (package: {
plugin = package;
optional = false;
})
(buildConfigPlugins
vimOptions.optPlugins));
neovim = wrapNeovimUnstable vimOptions.package (makeNeovimConfig {
inherit (vimOptions) viAlias;
inherit (vimOptions) vimAlias;
inherit extraLuaPackages;
configure = {
customRC = vimOptions.builtConfigRC;
packages.myVimPackage = {
start = buildConfigPlugins vimOptions.startPlugins;
opt = buildConfigPlugins vimOptions.optPlugins;
};
};
};
inherit plugins;
customRC = vimOptions.builtConfigRC;
});
in {
inherit (module) options config;
inherit (module._module.args) pkgs;