lib: still not working, progress
This commit is contained in:
parent
eebe309328
commit
a80d021d34
2 changed files with 34 additions and 35 deletions
|
@ -4,33 +4,33 @@
|
|||
withSystem,
|
||||
...
|
||||
}: let
|
||||
inherit (inputs) self;
|
||||
inherit (inputs.nixpkgs) lib;
|
||||
# inherit (lib.builders) mkSystem;
|
||||
mkSystem = {
|
||||
withSystem,
|
||||
system,
|
||||
...
|
||||
} @ args:
|
||||
withSystem system (
|
||||
{
|
||||
inputs',
|
||||
self',
|
||||
...
|
||||
}:
|
||||
lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs =
|
||||
lib.recursiveUpdate
|
||||
{
|
||||
inherit lib;
|
||||
inherit inputs inputs';
|
||||
inherit self self';
|
||||
}
|
||||
(args.specialArgs or {});
|
||||
inherit (args) modules;
|
||||
}
|
||||
);
|
||||
# inherit (inputs) self;
|
||||
# inherit (inputs.nixpkgs) lib;
|
||||
inherit (lib.builders) mkSystem;
|
||||
# mkSystem = {
|
||||
# withSystem,
|
||||
# system,
|
||||
# ...
|
||||
# } @ args:
|
||||
# withSystem system (
|
||||
# {
|
||||
# inputs',
|
||||
# self',
|
||||
# ...
|
||||
# }:
|
||||
# lib.nixosSystem {
|
||||
# inherit system;
|
||||
# specialArgs =
|
||||
# lib.recursiveUpdate
|
||||
# {
|
||||
# inherit lib;
|
||||
# inherit inputs inputs';
|
||||
# inherit self self';
|
||||
# }
|
||||
# (args.specialArgs or {});
|
||||
# inherit (args) modules;
|
||||
# }
|
||||
# );
|
||||
in {
|
||||
flake.nixosConfigurations = {
|
||||
temperance = mkSystem {
|
||||
|
|
|
@ -2,18 +2,17 @@
|
|||
callLibs = path:
|
||||
import path {
|
||||
inherit inputs;
|
||||
inherit lib;
|
||||
lib = extendedLib;
|
||||
};
|
||||
lib = inputs.nixpkgs.lib.extend {
|
||||
extendedLib = inputs.nixpkgs.lib.extend {
|
||||
builders = callLibs ./builders.nix;
|
||||
};
|
||||
in {
|
||||
perSystem = {
|
||||
_module.args.lib = lib;
|
||||
};
|
||||
# perSystem = {
|
||||
# _module.args.lib = lib;
|
||||
# };
|
||||
flake = {
|
||||
inherit lib;
|
||||
# raf what the hell does this do you made me set it
|
||||
_module.args.lib = lib;
|
||||
lib = extendedLib;
|
||||
_module.args.lib = extendedLib;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue