From efa3ad6abd9cdea5513cb3fb441c93033ed253b8 Mon Sep 17 00:00:00 2001 From: colin Date: Sun, 22 May 2022 15:06:27 -0700 Subject: [PATCH] flake.nix: simplify nixosConfigurations and imgs population --- flake.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 3f03a542..64696f3f 100644 --- a/flake.nix +++ b/flake.nix @@ -81,18 +81,8 @@ }).config.system.build.raw; }; - nixosConfigurations = {} - // self.machines.uninsane.nixosConfigurations - // self.machines.desko.nixosConfigurations - // self.machines.lappy.nixosConfigurations - // self.machines.pda.nixosConfigurations - ; - imgs = {} - // self.machines.uninsane.imgs - // self.machines.desko.imgs - // self.machines.lappy.imgs - // self.machines.pda.imgs - ; + nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfigurations."${name}") self.machines; + imgs = builtins.mapAttrs (name: value: value.imgs."${name}") self.machines; decl-machine = { system, extraModules }: (nixpkgs.lib.nixosSystem { inherit system;