1
0

lib/flake-helper.nix,flake/nixosConfigurations.nix: Move functions to flake directory

This commit is contained in:
clerie 2024-05-13 17:39:54 +02:00
parent 2a3281a7c4
commit d55dc35882
Signed by: clerie
GPG Key ID: BD9F56480870BAD2
3 changed files with 9 additions and 8 deletions

View File

@ -90,7 +90,7 @@
_iso = { name = "_iso"; }; _iso = { name = "_iso"; };
}; };
nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts; nixosConfigurations = import ./flake/nixosConfigurations.nix inputs;
nixosModules = { nixosModules = {
nixfilesInputs = import ./flake/modules.nix inputs; nixfilesInputs = import ./flake/modules.nix inputs;

View File

@ -1,6 +1,9 @@
{ self, nixpkgs, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, sops-nix, ... }@inputs: { self
, nixpkgs
, ...
}@inputs:
rec { let
generateNixosSystem = { generateNixosSystem = {
name, name,
system ? "x86_64-linux", system ? "x86_64-linux",
@ -57,4 +60,6 @@ rec {
}; };
mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts; mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts;
}
in
mapToNixosConfigurations self.clerie.hosts

View File

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