use also buildClan
All checks were successful
build / test (pull_request) Successful in 5m45s
checks / test (pull_request) Successful in 21s

This commit is contained in:
Jörg Thalheim 2023-09-19 14:04:52 +02:00
parent 617c897810
commit dfd39c8ce9
2 changed files with 15 additions and 28 deletions

View File

@ -6,13 +6,7 @@
# FIXME: switch to VPN later
{ networking.firewall.allowedTCPPorts = [ 9273 ]; }
inputs.clan-core.nixosModules.clanCore
./admins.nix
{
# TODO: use buildClan
clanCore.clanDir = "${./..}";
clanCore.machineName = "web01";
}
];
hetzner-ax102.imports = [

View File

@ -1,24 +1,17 @@
{ lib, self, ... }:
let
entries = builtins.attrNames (builtins.readDir ./.);
configs = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/configuration.nix")) entries;
in
{ self, inputs, ... }:
{
flake.nixosConfigurations = lib.listToAttrs
(builtins.map
(name:
lib.nameValuePair
(builtins.replaceStrings [ "." ] [ "-" ] name)
(lib.nixosSystem {
system = "x86_64-linux";
# Make flake available in modules
specialArgs = {
self = {
inherit (self) inputs nixosModules packages;
};
};
modules = [ (./. + "/${name}/configuration.nix") ];
}))
configs);
flake.nixosConfigurations = inputs.clan-core.lib.buildClan {
directory = self;
# Make flake available in modules
specialArgs = {
self = {
inherit (self) inputs nixosModules packages;
};
};
machines = {
web01 = { modulesPath, ... }: {
imports = [ (./web01/configuration.nix) ];
};
};
};
}