From 1c596593caa625c4448f9e2af72c74d727154867 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 25 May 2024 15:56:49 -0400
Subject: [PATCH] try to fix attrset generation

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 lib/microvms.nix                   | 35 ++++++++++++------------------
 systems/palatine-hill/microvms.nix | 20 ++++++++---------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/lib/microvms.nix b/lib/microvms.nix
index edc6145..f95c2f4 100644
--- a/lib/microvms.nix
+++ b/lib/microvms.nix
@@ -1,34 +1,28 @@
 { lib, ... }:
 rec {
-  genK3SFromList =
-    server-config: agent-config:
-    {
-      host,
-      ipv4,
-      server ? false,
-    }@args:
+  genK3SVM =
+    server-config: agent-config: vms:
     lib.mapAttrs (
-      args:
-      lib.rad-dev.microvms.genMicroVM args.host args.ipv4 "x86_64-linux" (
-        if server then import server-config else import agent-config
+      host: {ipv4,server ? false}:
+      genMicroVM host ipv4 "x86_64-linux" (
+        if server then (import server-config) else (import agent-config)
       )
-    ) args;
+    ) vms;
 
   genMicroVM =
     hostName: ipv4: system: vm-config:
     # microvm refers to microvm.nixosModules
 
+    # {
+    #   config,
+    #   pkgs,
+    #   lib,
+    #   ...
+    # }:
     {
-      config,
-      pkgs,
-      lib,
-      ...
-    }:
-    {
-      ${hostName} = {
         # The package set to use for the microvm. This also determines the microvm's architecture.
         # Defaults to the host system's package set if not given.
-        pkgs = import pkgs { inherit system; };
+        # pkgs = import pkgs { inherit system; };
 
         # (Optional) A set of special arguments to be passed to the MicroVM's NixOS modules.
         #specialArgs = {};
@@ -51,13 +45,12 @@ rec {
             inherit hostName;
             interfaces.ether.ipv4.addreses = {
               address = ipv4;
-              prefixLength = 24;
+              prefixLength = 32;
             };
           };
 
           # Any other configuration for your MicroVM
           # [...]
         } // vm-config;
-      };
     };
 }
diff --git a/systems/palatine-hill/microvms.nix b/systems/palatine-hill/microvms.nix
index 256a598..44abf16 100644
--- a/systems/palatine-hill/microvms.nix
+++ b/systems/palatine-hill/microvms.nix
@@ -6,22 +6,20 @@
   ...
 }:
 let
-  inherit (lib.rad-dev.microvm) genK3SFromList;
+  inherit (lib.rad-dev.microvm) genK3SVM;
 in
 
 {
   # rad-dev.microvm-host.enable = true;
   rad-dev.microvm-host.vms =
-    genK3SFromList (src + "/modules/opt/k3s-server.nix") (src + "/modules/opt/k3s-agent.nix")
-      [
-        {
-          host = "ph-server-1";
+    genK3SVM (src + "/modules/opt/k3s-server.nix") (src + "/modules/opt/k3s-agent.nix")
+      {
+        "ph-server-1" = {
           ipv4 = "192.168.69.10";
           server = true;
-        }
-        {
-          host = "ph-agent-1";
-          ipv4 = "192.168.69.30";
-        }
-      ];
+        };
+        # "ph-agent-1" = {
+        #   ipv4 = "192.168.69.30";
+        # };
+      };
 }