From 3a332e77d110a3255c6911ba33bc279048aaee74 Mon Sep 17 00:00:00 2001
From: ahtlon <atlan@ahtlon.de>
Date: Sat, 18 Jan 2025 21:45:48 +0100
Subject: [PATCH 1/2] [scripts] move packages to legacyPackages

---
 outputs.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/outputs.nix b/outputs.nix
index e324da68..41e2be79 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -20,7 +20,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
     let
       sops = sops-nix.packages."${pkgs.system}";
       microvmpkg = microvm.packages."${pkgs.system}";
-      installed = builtins.attrNames self.packages."${pkgs.system}".scripts;
+      installed = builtins.attrNames self.legacyPackages."${pkgs.system}".scripts;
     in
     pkgs.mkShell {
       sopsPGPKeyDirs = [
@@ -38,13 +38,14 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
         pkgs.mdbook
         microvmpkg.microvm
       ];
-      packages = builtins.map (pkgName: self.packages."${pkgs.system}".scripts.${pkgName}) installed;
+      packages = builtins.map (pkgName: self.legacyPackages."${pkgs.system}".scripts.${pkgName}) installed;
       shellHook = ''echo "Available scripts: ${builtins.concatStringsSep " " installed}"'';
     };
-
-    packages = {
+    legacyPackages = {
       scripts.remote-install = pkgs.writeShellScriptBin "remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
       scripts.boot-unlock = pkgs.writeShellScriptBin "boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
+    };
+    packages = {
       docs = pkgs.stdenv.mkDerivation {
         name = "malobeo-docs";
         phases = [ "buildPhase" ];

From 3861daaf76b44bf326ea4bd03d70ccdab3ac644e Mon Sep 17 00:00:00 2001
From: ahtlon <atlan@ahtlon.de>
Date: Sat, 18 Jan 2025 22:01:06 +0100
Subject: [PATCH 2/2] [modules] move microvm module import from makeMicroVM to
 baseModules

---
 machines/configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/machines/configuration.nix b/machines/configuration.nix
index 9bb98918..d176016d 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -3,6 +3,7 @@
 , nixpkgs
 , sops-nix
 , inputs
+, microvm
 , nixos-hardware
 , home-manager
 , ...
@@ -34,15 +35,14 @@ let
             };
           };
         })
-
         sops-nix.nixosModules.sops
+        microvm.nixosModules.microvm
       ];
     }
   ];
   defaultModules = baseModules;
 
   makeMicroVM = hostName: ipv4Addr: macAddr: modules: [
-    inputs.microvm.nixosModules.microvm
     {
       microvm = {
         hypervisor = "cloud-hypervisor";