mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
modules/nixpkgs: initial pkgs
option, drop defaultPkgs
specialArg
This minimal implementation allows `nixpkgs.pkgs` to be defined, but does not implement evaluating an instance from a pkgsPath when _not_ defined. The `defaultPkgs` specialArg is dropped in favour of `nixpkgs.pkgs` being defined. If it's not defined, an assertion is thrown. In the future, a nixpkgs source path can be supplied, defaulting to the flake's `inputs.nixpkgs`. Along with other `nixpkgs.*` options, this will allow a `pkgs` instance to be evaluated within the module eval.
This commit is contained in:
parent
8c3d521bff
commit
4b7a41276a
11 changed files with 111 additions and 43 deletions
|
@ -3,13 +3,14 @@
|
|||
self,
|
||||
}:
|
||||
rec {
|
||||
# Minimal specialArgs required to evaluate nixvim modules
|
||||
specialArgs = specialArgsWith { };
|
||||
|
||||
# Build specialArgs for evaluating nixvim modules
|
||||
specialArgsWith =
|
||||
# TODO: switch defaultPkgs -> pkgsPath (i.e. pkgs.path or inputs.nixvim)
|
||||
# FIXME: Ideally, we should not require callers to pass in _anything_ specific
|
||||
{ defaultPkgs, ... }@extraSpecialArgs:
|
||||
extraSpecialArgs:
|
||||
{
|
||||
inherit lib defaultPkgs;
|
||||
inherit lib;
|
||||
# TODO: deprecate `helpers`
|
||||
helpers = self;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue