mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-09-06 10:21:31 +00:00
Merge branch 'main' into main
This commit is contained in:
commit
18e659dd7d
2 changed files with 8 additions and 11 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -38,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"mnw": {
|
"mnw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746230955,
|
"lastModified": 1746338991,
|
||||||
"narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=",
|
"narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "mnw",
|
"repo": "mnw",
|
||||||
"rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d",
|
"rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -62,17 +62,14 @@
|
||||||
filter (f: f != null) plugins
|
filter (f: f != null) plugins
|
||||||
);
|
);
|
||||||
|
|
||||||
# built (or "normalized") plugins that are modified
|
|
||||||
builtStartPlugins = buildConfigPlugins config.vim.startPlugins;
|
|
||||||
builtOptPlugins = map (package: package // {optional = true;}) (
|
|
||||||
buildConfigPlugins config.vim.optPlugins
|
|
||||||
);
|
|
||||||
|
|
||||||
# Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
|
# Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
|
||||||
# generate a wrapped Neovim package.
|
# generate a wrapped Neovim package.
|
||||||
neovim-wrapped = inputs.mnw.lib.wrap pkgs {
|
neovim-wrapped = inputs.mnw.lib.wrap {inherit pkgs;} {
|
||||||
neovim = config.vim.package;
|
neovim = config.vim.package;
|
||||||
plugins = builtStartPlugins ++ builtOptPlugins;
|
plugins = {
|
||||||
|
start = buildConfigPlugins config.vim.startPlugins;
|
||||||
|
opt = buildConfigPlugins config.vim.optPlugins;
|
||||||
|
};
|
||||||
appName = "nvf";
|
appName = "nvf";
|
||||||
extraBinPath = config.vim.extraPackages;
|
extraBinPath = config.vim.extraPackages;
|
||||||
initLua = config.vim.builtLuaConfigRC;
|
initLua = config.vim.builtLuaConfigRC;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue