mirror of
https://github.com/JulienMalka/snowfield.git
synced 2025-03-25 21:30:52 +01:00
chore: reduce number of dnsLib eval
This commit is contained in:
parent
58ae074dfd
commit
31a1771726
5 changed files with 11 additions and 11 deletions
|
@ -7,11 +7,12 @@ let
|
|||
version = "nixos-unstable";
|
||||
};
|
||||
};
|
||||
lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final self.profiles);
|
||||
dnsLib = (import inputs.dns).lib;
|
||||
lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final self.profiles dnsLib);
|
||||
mkLibForMachine =
|
||||
machine:
|
||||
(import "${lib.snowfield.${machine}.nixpkgs_version}/lib").extend (
|
||||
import ./lib inputs_final self.profiles
|
||||
import ./lib inputs_final self.profiles dnsLib
|
||||
);
|
||||
machines_plats = lib.lists.unique (
|
||||
lib.mapAttrsToList (_name: value: value.arch) (
|
||||
|
@ -45,7 +46,7 @@ let
|
|||
nixosConfigurations = builtins.mapAttrs (
|
||||
name: value:
|
||||
(mkMachine {
|
||||
inherit name self;
|
||||
inherit name self dnsLib;
|
||||
host-config = value;
|
||||
modules = builtins.attrValues nixosModules ++ lib.snowfield.${name}.profiles;
|
||||
nixpkgs = lib.snowfield.${name}.nixpkgs_version;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
inputs: profiles: final: _prev:
|
||||
inputs: profiles: dnsLib: final: _prev:
|
||||
|
||||
with builtins;
|
||||
let
|
||||
|
@ -72,7 +72,7 @@ rec {
|
|||
|
||||
dns = import ./dns.nix {
|
||||
lib = final;
|
||||
dnsLib = (import inputs.dns).lib;
|
||||
inherit dnsLib;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -15,15 +15,16 @@ in
|
|||
system ? "x86_64-linux",
|
||||
home-manager ? inputs.home-manager,
|
||||
self,
|
||||
dnsLib,
|
||||
}:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in
|
||||
import "${nixpkgs}/nixos/lib/eval-config.nix" {
|
||||
inherit system;
|
||||
lib = pkgs.lib.extend (import ./default.nix inputs self.profiles);
|
||||
lib = pkgs.lib.extend (import ./default.nix inputs self.profiles dnsLib);
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit inputs dnsLib;
|
||||
inherit (self) nixosConfigurations profiles;
|
||||
};
|
||||
modules = modules ++ [
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
nixosConfigurations,
|
||||
dnsLib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -40,7 +40,6 @@ let
|
|||
)
|
||||
);
|
||||
|
||||
dnsLib = (import inputs.dns).lib;
|
||||
evalZones =
|
||||
zones:
|
||||
(lib.evalModules {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
dnsLib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -15,7 +15,6 @@ let
|
|||
];
|
||||
|
||||
isVPNDomain = domain: lib.dns.domainToZone [ "luj" ] domain != null;
|
||||
dnsLib = (import inputs.dns).lib;
|
||||
SOA = {
|
||||
nameServer = "ns";
|
||||
adminEmail = "dns@malka.sh";
|
||||
|
|
Loading…
Add table
Reference in a new issue