flake: move 'nixosConfigurations' to 'flake/'
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Bruno BELANYI 2023-03-07 12:20:14 +00:00
parent 40fff4b13a
commit d14f96d584
2 changed files with 38 additions and 32 deletions

View file

@ -80,34 +80,6 @@
eachMySystem = eachSystem mySystems;
defaultModules = [
({ ... }: {
# Let 'nixos-version --json' know about the Git revision
system.configurationRevision = self.rev or "dirty";
})
{
nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
nur.overlay
];
}
# Include generic settings
./modules
# Include bundles of settings
./profiles
];
buildHost = name: system: lib.nixosSystem {
inherit system;
modules = defaultModules ++ [
(./. + "/machines/${name}")
];
specialArgs = {
# Use my extended lib in NixOS configuration
inherit lib;
# Inject inputs to use them in global registry
inherit inputs;
};
};
in
eachMySystem
(system:
@ -164,9 +136,6 @@
overlays = import ./flake/overlays.nix inputs;
nixosConfigurations = lib.mapAttrs buildHost {
aramis = "x86_64-linux";
porthos = "x86_64-linux";
};
nixosConfigurations = import ./flake/nixos.nix inputs;
};
}

37
flake/nixos.nix Normal file
View file

@ -0,0 +1,37 @@
{ self, nixpkgs, nur, ... } @ inputs:
let
inherit (self) lib;
defaultModules = [
({ ... }: {
# Let 'nixos-version --json' know about the Git revision
system.configurationRevision = self.rev or "dirty";
})
{
nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
nur.overlay
];
}
# Include generic settings
"${self}/modules"
# Include bundles of settings
"${self}/profiles"
];
buildHost = name: system: lib.nixosSystem {
inherit system;
modules = defaultModules ++ [
"${self}/machines/${name}"
];
specialArgs = {
# Use my extended lib in NixOS configuration
inherit lib;
# Inject inputs to use them in global registry
inherit inputs;
};
};
in
lib.mapAttrs buildHost {
aramis = "x86_64-linux";
porthos = "x86_64-linux";
}