From 8ed7dba1812275f19401d7368236c1dc46b0aca3 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 20 Jan 2022 03:07:16 +0100
Subject: [PATCH] flake.nix: add *-vm packages to boot hosts in a test virtual
 machine

Requested-By: poelzi
---
 flake.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index f5a26d9e..d23b9521 100644
--- a/flake.nix
+++ b/flake.nix
@@ -181,11 +181,18 @@
             '';
           }) {} (builtins.attrNames flakifiedHosts) //
 
-        builtins.foldl' (result: host: result // {
-          "${host}-sdImage" = self.nixosConfigurations."${host}".config.system.build.sdImage;
-        }) {} (builtins.attrNames (nixpkgs.lib.filterAttrs (host: nixosConfiguration:
-          nixosConfiguration.config.system.build ? sdImage
-        ) self.nixosConfigurations))
+        builtins.foldl' (result: host:
+          let
+            inherit (self.nixosConfigurations.${host}) config;
+          in
+            result //
+            nixpkgs.lib.optionalAttrs (config.system.build ? sdImage) {
+              "${host}-sdImage" = config.system.build.sdImage;
+            } //
+            nixpkgs.lib.optionalAttrs (config.system.build ? vm) {
+              "${host}-vm" = config.system.build.vm;
+            }
+        ) {} (builtins.attrNames self.nixosConfigurations)
       ) self.legacyPackages;
 
       nixosConfigurations = let