flake.lock: update neovim-wrapper (#336)

* flake.lock: update neovim-wrapper

* modules/default: half size of plugins
This commit is contained in:
Gerg-L 2024-07-13 22:04:10 +00:00 committed by GitHub
parent 5fab82ba91
commit ce0b361bca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 16 deletions

View file

@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720539383, "lastModified": 1720906640,
"narHash": "sha256-HF4+pQJwgw62lLpWo5TiXFb8ui0FpZcb2TkSh9qXju8=", "narHash": "sha256-hQ++e9r03DPy9UByZ3aSweRn74EUx3HuoBTaUzYdE0E=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "neovim-wrapper", "repo": "neovim-wrapper",
"rev": "a2b26accc1c414bc0ef0132ab167e2973dc26e68", "rev": "be1a9ec41230708ac72cabb1c5f4492f4f01f6d1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -33,13 +33,27 @@ inputs: {
# build a vim plugin with the given name and arguments # build a vim plugin with the given name and arguments
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
# instead # instead
buildPlug = {pname, ...} @ args: buildPlug = {pname, ...} @ attrs: let
assert assertMsg (pname != "nvim-treesitter") "Use buildTreesitterPlug for building nvim-treesitter.";
buildVimPlugin (args
// {
version = "master";
src = getAttr ("plugin-" + pname) inputs; src = getAttr ("plugin-" + pname) inputs;
}); in
pkgs.runCommand pname {
inherit src;
version = src.shortRev or src.shortDirtyRev or "dirty";
}
// attrs
''
mkdir -p $out
cp -r . $out
'';
noBuildPlug = {pname, ...} @ attrs: let
input = getAttr ("plugin-" + pname) inputs;
in
{
version = input.shortRev or input.shortDirtyRev or "dirty";
outPath = getAttr ("plugin-" + pname) inputs;
}
// attrs;
buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars); buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
@ -53,11 +67,14 @@ inputs: {
then (buildTreesitterPlug vimOptions.treesitter.grammars) then (buildTreesitterPlug vimOptions.treesitter.grammars)
else if (plug == "flutter-tools-patched") else if (plug == "flutter-tools-patched")
then then
(buildPlug { (
buildPlug
{
pname = "flutter-tools"; pname = "flutter-tools";
patches = [../patches/flutter-tools.patch]; patches = [../patches/flutter-tools.patch];
}) }
else (buildPlug {pname = plug;}) )
else noBuildPlug {pname = plug;}
) )
else plug else plug
)) ))
@ -84,7 +101,7 @@ inputs: {
neovim-wrapped = inputs.neovim-wrapper.legacyPackages.${pkgs.stdenv.system}.neovimWrapper { neovim-wrapped = inputs.neovim-wrapper.legacyPackages.${pkgs.stdenv.system}.neovimWrapper {
neovim = vimOptions.package; neovim = vimOptions.package;
plugins = concatLists [builtStartPlugins builtOptPlugins]; plugins = concatLists [builtStartPlugins builtOptPlugins];
wrapperArgs = ["--set" "NVIM_APPNAME" "nvf"]; appName = "nvf";
initViml = vimOptions.builtConfigRC; initViml = vimOptions.builtConfigRC;
extraBinPath = vimOptions.extraPackages; extraBinPath = vimOptions.extraPackages;