clerie/nixfiles
1
0
Fork 0
Code

flake.nix: Move hydraJobs to seperate file

Browse Source
This commit is contained in:
clerie 2024-05-13 16:21:47 +02:00
parent 1f7ffd82ba
commit 6beb8db05a
Signed by: clerie
GPG Key ID: BD9F56480870BAD2
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -124,12 +124,7 @@
inherit lib self; inherit lib self;
hydraJobs = { hydraJobs = import ./flake/hydraJobs.nix inputs;
inherit (self)
packages;
nixosConfigurations = helper.buildHosts self.nixosConfigurations;
iso = self.nixosConfigurations._iso.config.system.build.isoImage;
};
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [

15
flake/hydraJobs.nix Normal file
View File

@ -0,0 +1,15 @@
{ self
, nixpkgs
, ...
}@inputs:
let
buildHosts = hosts: builtins.mapAttrs (name: host: host.config.system.build.toplevel) (nixpkgs.lib.filterAttrs (name: host: (builtins.substring 0 1 name) != "_") hosts);
in {
inherit (self)
packages;
nixosConfigurations = buildHosts self.nixosConfigurations;
iso = self.nixosConfigurations._iso.config.system.build.isoImage;
}

3
lib/default.nix
View File

@ -10,8 +10,7 @@ let
flake-helper = callLibs ./flake-helper.nix; flake-helper = callLibs ./flake-helper.nix;
inherit ("flake-helper") inherit ("flake-helper")
generateNixosSystem generateNixosSystem
mapToNixosConfigurations mapToNixosConfigurations;
buildHosts;
clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix; clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix;
}; };

2
lib/flake-helper.nix
View File

@ -54,6 +54,4 @@ rec {
}; };
mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts; mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts;
buildHosts = hosts: builtins.mapAttrs (name: host: host.config.system.build.toplevel) (nixpkgs.lib.filterAttrs (name: host: (builtins.substring 0 1 name) != "_") hosts);
} }