Reorder settings in flake

This commit is contained in:
Manuel Thalmann 2024-05-01 19:13:25 +02:00
parent 92a4e3d332
commit 4141931c39

View file

@ -6,57 +6,56 @@
flake-utils.url = "github:numtide/flake-utils?ref=b1d9ab70662946ef0850d488da1c9019f3a9752a";
};
outputs = { self, nixpkgs, flake-utils }:
let
systems = [
{
name = "nixos";
}
];
in
flake-utils.lib.eachDefaultSystem (
system:
outputs = { self, nixpkgs, flake-utils }: (
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShellNoCC (
with pkgs;
{
packages = [
nixos-rebuild
];
});
}
) // {
nixosConfigurations =
let
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShellNoCC (
with pkgs;
systems = [
{
packages = [
nixos-rebuild
];
});
}
) //
{
nixosConfigurations = builtins.listToAttrs
(
name = "nixos";
}
];
in
builtins.listToAttrs (
builtins.map (
{ name, system ? "x86_64-linux", ... }@config:
{
inherit name;
{ name, system ? "x86_64-linux", ... }@config: {
inherit name;
value = nixpkgs.lib.nixosSystem {
inherit system;
value = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
({ ... }: { config._module.args = { machineConfig = config; }; })
./lib/configuration.nix
modules = [
({ ... }: { config._module.args = { machineConfig = config; }; })
./lib/configuration.nix
(
let
configCandidate = ./lib/machines/${name}.nix;
machineConfigPath =
if builtins.pathExists configCandidate
then
configCandidate
else
./lib/hardware/base.nix;
in
machineConfigPath)
];
};
})
(
let
configCandidate = ./lib/machines/${name}.nix;
machineConfigPath =
if builtins.pathExists configCandidate
then
configCandidate
else
./lib/hardware/base.nix;
in
machineConfigPath)
];
};
})
systems);
};
});
}