mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-01 11:01:15 +00:00
modules: fix build (#353)
Some checks failed
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled
Some checks failed
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled
* flake.lock: lock * remove ussage of mapAttrsFlatten * flake.lock: update mnw * modules/default.nix makeNeovimConfig -> mnw * modules/default.nix use buildVimPlugin (sad) dont build when possible
This commit is contained in:
parent
de20ff2c51
commit
7d824d6711
3 changed files with 47 additions and 43 deletions
23
flake.lock
23
flake.lock
|
@ -69,11 +69,11 @@
|
|||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1722191188,
|
||||
"narHash": "sha256-YF//iMALbrd2Ni9aju7w8NniH16Qz6RFTRD6md5UkDc=",
|
||||
"lastModified": 1723419050,
|
||||
"narHash": "sha256-Eb8jBUgHwpte+bGsqeXNbKMBfZaDB7RiPQwyb1vzJK8=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"rev": "c7b289f3f5a31b6e744be37d83fc231816621231",
|
||||
"rev": "e625f5965567f16102bc52897c7600dcde53c6c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -939,6 +939,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugin-new-file-template-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1721518222,
|
||||
"narHash": "sha256-g0IjJrHRXw7U9goVLzVYUyHBSsDZGHMpi3YZPhg64zA=",
|
||||
"owner": "otavioschwanck",
|
||||
"repo": "new-file-template.nvim",
|
||||
"rev": "6ac66669dbf2dc5cdee184a4fe76d22465ca67e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "otavioschwanck",
|
||||
"repo": "new-file-template.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugin-noice-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -1862,6 +1878,7 @@
|
|||
"plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
|
||||
"plugin-neocord": "plugin-neocord",
|
||||
"plugin-neodev-nvim": "plugin-neodev-nvim",
|
||||
"plugin-new-file-template-nvim": "plugin-new-file-template-nvim",
|
||||
"plugin-noice-nvim": "plugin-noice-nvim",
|
||||
"plugin-none-ls": "plugin-none-ls",
|
||||
"plugin-nui-nvim": "plugin-nui-nvim",
|
||||
|
|
|
@ -9,75 +9,63 @@ inputs: {
|
|||
inherit (pkgs) vimPlugins;
|
||||
inherit (lib.strings) isString toString;
|
||||
inherit (lib.lists) filter map concatLists;
|
||||
inherit (lib.attrsets) recursiveUpdate;
|
||||
|
||||
# import modules.nix with `check`, `pkgs` and `lib` as arguments
|
||||
# check can be disabled while calling this file is called
|
||||
# to avoid checking in all modules
|
||||
nvimModules = import ./modules.nix {
|
||||
inherit pkgs check lib;
|
||||
};
|
||||
nvimModules = import ./modules.nix {inherit pkgs check lib;};
|
||||
|
||||
# evaluate the extended library with the modules
|
||||
# optionally with any additional modules passed by the user
|
||||
module = lib.evalModules {
|
||||
specialArgs = recursiveUpdate {modulesPath = toString ./.;} extraSpecialArgs;
|
||||
specialArgs = extraSpecialArgs // {modulesPath = toString ./.;};
|
||||
modules = concatLists [[configuration] nvimModules extraModules];
|
||||
};
|
||||
|
||||
# alias to the internal configuration
|
||||
vimOptions = module.config.vim;
|
||||
|
||||
noBuildPlug = {pname, ...} @ attrs: let
|
||||
src = inputs."plugin-${attrs.pname}";
|
||||
in
|
||||
{
|
||||
version = src.shortRev or src.shortDirtyRev or "dirty";
|
||||
outPath = src;
|
||||
passthru.vimPlugin = false;
|
||||
}
|
||||
// attrs;
|
||||
|
||||
# build a vim plugin with the given name and arguments
|
||||
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
|
||||
# instead
|
||||
buildPlug = attrs: let
|
||||
src = inputs."plugin-${attrs.pname}";
|
||||
in
|
||||
pkgs.stdenvNoCC.mkDerivation ({
|
||||
pkgs.vimUtils.buildVimPlugin (
|
||||
{
|
||||
version = src.shortRev or src.shortDirtyRev or "dirty";
|
||||
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = with pkgs.vimUtils; [
|
||||
vimCommandCheckHook
|
||||
vimGenDocHook
|
||||
neovimRequireCheckHook
|
||||
];
|
||||
passthru.vimPlugin = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r . $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
// attrs);
|
||||
// attrs
|
||||
);
|
||||
|
||||
buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
|
||||
|
||||
pluginBuilders = {
|
||||
nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
|
||||
flutter-tools-patched =
|
||||
buildPlug
|
||||
{
|
||||
pname = "flutter-tools";
|
||||
patches = [../patches/flutter-tools.patch];
|
||||
};
|
||||
flutter-tools-patched = buildPlug {
|
||||
pname = "flutter-tools";
|
||||
patches = [../patches/flutter-tools.patch];
|
||||
};
|
||||
};
|
||||
|
||||
buildConfigPlugins = plugins:
|
||||
map
|
||||
(
|
||||
map (
|
||||
plug:
|
||||
if (isString plug)
|
||||
then pluginBuilders.${plug} or (buildPlug {pname = plug;})
|
||||
then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
|
||||
else plug
|
||||
)
|
||||
(filter (f: f != null) plugins);
|
||||
) (filter (f: f != null) plugins);
|
||||
|
||||
# built (or "normalized") plugins that are modified
|
||||
builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
|
||||
|
@ -87,7 +75,7 @@ inputs: {
|
|||
}) (buildConfigPlugins vimOptions.optPlugins);
|
||||
|
||||
# additional Lua and Python3 packages, mapped to their respective functions
|
||||
# to conform to the format makeNeovimConfig expects. end user should
|
||||
# to conform to the format mnw expects. end user should
|
||||
# only ever need to pass a list of packages, which are modified
|
||||
# here
|
||||
extraLuaPackages = ps: map (x: ps.${x}) vimOptions.luaPackages;
|
||||
|
@ -97,7 +85,7 @@ inputs: {
|
|||
# generate a wrapped Neovim package.
|
||||
neovim-wrapped = inputs.mnw.lib.wrap pkgs {
|
||||
neovim = vimOptions.package;
|
||||
plugins = concatLists [builtStartPlugins builtOptPlugins];
|
||||
plugins = builtStartPlugins ++ builtOptPlugins;
|
||||
appName = "nvf";
|
||||
extraBinPath = vimOptions.extraPackages;
|
||||
initLua = vimOptions.builtLuaConfigRC;
|
||||
|
|
|
@ -5,9 +5,8 @@
|
|||
}: let
|
||||
inherit (builtins) map mapAttrs filter;
|
||||
inherit (lib.options) mkOption;
|
||||
inherit (lib.attrsets) filterAttrs getAttrs attrValues attrNames;
|
||||
inherit (lib.attrsets) mapAttrsToList filterAttrs getAttrs attrValues attrNames;
|
||||
inherit (lib.strings) concatLines concatMapStringsSep;
|
||||
inherit (lib.misc) mapAttrsFlatten;
|
||||
inherit (lib.trivial) showWarnings;
|
||||
inherit (lib.types) str nullOr;
|
||||
inherit (lib.generators) mkLuaInline;
|
||||
|
@ -83,7 +82,7 @@ in {
|
|||
config = let
|
||||
filterNonNull = attrs: filterAttrs (_: value: value != null) attrs;
|
||||
globalsScript =
|
||||
mapAttrsFlatten (name: value: "vim.g.${name} = ${toLuaObject value}")
|
||||
mapAttrsToList (name: value: "vim.g.${name} = ${toLuaObject value}")
|
||||
(filterNonNull cfg.globals);
|
||||
|
||||
extraPluginConfigs = resolveDag {
|
||||
|
|
Loading…
Reference in a new issue