Refactor flake
This commit is contained in:
parent
5ca2b6f473
commit
d79e0b8acc
5 changed files with 35 additions and 33 deletions
|
@ -1,4 +1,4 @@
|
|||
{ machines, dns, myLib, flake-utils, kubenix, nixhelm, blog-pim, ... }: flake-utils.lib.eachDefaultSystem
|
||||
{ self, machines, dns, myLib, flake-utils, kubenix, nixhelm, blog-pim, ... }: flake-utils.lib.eachDefaultSystem
|
||||
(system:
|
||||
let
|
||||
mkKubenixPackage = module: kubenix.packages.${system}.default.override
|
||||
|
@ -8,6 +8,6 @@
|
|||
};
|
||||
in
|
||||
{
|
||||
kubenix = mkKubenixPackage ../kubenix-modules/all.nix;
|
||||
kubenix-bootstrap = mkKubenixPackage ../kubenix-modules/base.nix;
|
||||
kubenix = mkKubenixPackage "${self}/kubenix-modules/all.nix";
|
||||
kubenix-bootstrap = mkKubenixPackage "${self}/kubenix-modules/base.nix";
|
||||
})
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ myLib, nixpkgs, nixpkgs-unstable, machines, dns, agenix, nixos-hardware, kubenix, disko, ... }:
|
||||
{ self, myLib, nixpkgs, machines, ... }@inputs:
|
||||
let
|
||||
mkNixosSystems = systemDef:
|
||||
builtins.mapAttrs
|
||||
|
@ -11,19 +11,11 @@ in
|
|||
nixosConfigurations = mkNixosSystems (name: machine: {
|
||||
system = machine.arch;
|
||||
|
||||
specialArgs = { inherit myLib nixpkgs-unstable machines machine dns agenix nixos-hardware kubenix disko; };
|
||||
specialArgs = { inherit self inputs myLib machine machines; };
|
||||
|
||||
modules = [
|
||||
../configuration.nix
|
||||
"${self}/configuration.nix"
|
||||
{ networking.hostName = name; }
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(final: _prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
system = machine.arch;
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
];
|
||||
});
|
||||
}
|
||||
|
|
Reference in a new issue