flake: simplify machine generation
This commit is contained in:
parent
efa3ad6abd
commit
ada574e8a8
12
flake.nix
12
flake.nix
|
@ -39,7 +39,7 @@
|
||||||
machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
|
machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
|
||||||
|
|
||||||
machines.pda = {
|
machines.pda = {
|
||||||
nixosConfigurations.pda = pkgs-mobile.lib.nixosSystem {
|
nixosConfiguration = pkgs-mobile.lib.nixosSystem {
|
||||||
# inherit (self.genpkgs.aarch64-linux) pkgs;
|
# inherit (self.genpkgs.aarch64-linux) pkgs;
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -67,7 +67,7 @@
|
||||||
# })
|
# })
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
imgs.pda = (pkgs-mobile.lib.nixosSystem {
|
img = (pkgs-mobile.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
mobile-nixos.nixosModules.pine64-pinephone ({
|
mobile-nixos.nixosModules.pine64-pinephone ({
|
||||||
|
@ -81,8 +81,8 @@
|
||||||
}).config.system.build.raw;
|
}).config.system.build.raw;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfigurations."${name}") self.machines;
|
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) self.machines;
|
||||||
imgs = builtins.mapAttrs (name: value: value.imgs."${name}") self.machines;
|
imgs = builtins.mapAttrs (name: value: value.img) self.machines;
|
||||||
|
|
||||||
decl-machine = { system, extraModules }: (nixpkgs.lib.nixosSystem {
|
decl-machine = { system, extraModules }: (nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
@ -107,8 +107,8 @@
|
||||||
decl-bootable-machine = { name, system }: (
|
decl-bootable-machine = { name, system }: (
|
||||||
let extraModules = [ ./machines/${name} ];
|
let extraModules = [ ./machines/${name} ];
|
||||||
in {
|
in {
|
||||||
nixosConfigurations."${name}" = self.decl-machine { inherit system; inherit extraModules; };
|
nixosConfiguration = self.decl-machine { inherit system; inherit extraModules; };
|
||||||
imgs."${name}" = self.decl-img { inherit system; inherit extraModules; };
|
img = self.decl-img { inherit system; inherit extraModules; };
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user