From fd41246110a8d1f2c1a59c7ca3fc636163fcbe1a Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 2 Nov 2022 23:35:42 +0100 Subject: [PATCH] flake.nix: go even less into self.nixosConfigurations.*.config --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 9a0c08f0..27d2d900 100644 --- a/flake.nix +++ b/flake.nix @@ -478,8 +478,7 @@ let inherit (self.nixosConfigurations.${host}) config; in - result // - nixos.lib.optionalAttrs (config.system.build ? vm) { + result // { # boot any machine in a microvm "${host}-vm" = (self.nixosConfigurations.${host} .extendModules { @@ -511,9 +510,11 @@ ]; }) .config.microvm.declaredRunner; - } // - nixos.lib.optionalAttrs (config.system.build ? tftproot) { - "${host}-tftproot" = config.system.build.tftproot; + + "${host}-tftproot" = + if config.system.build ? tftproot + then config.system.build.tftproot + else throw "No tftproot for ${host}"; } ) {} (builtins.attrNames self.nixosConfigurations) ) self.legacyPackages;