factor out evaluating options

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

deployment/check/netbox-ips/nixosTest.nix

@@ -6,6 +6,7 @@
 }:
 let
   inherit (pkgs) system;
+  inherit (pkgs.callPackage ../../utils.nix { }) evalOption;
   backendPort = builtins.toString 8080;
   tfBackend = fragment: {
     address = "http://localhost:${backendPort}/state/${fragment}";
@@ -17,30 +18,14 @@ let
     tf-netbox-store-ips
     tf-netbox-get-ip
     ;
-  netbox-store-ips =
-    (lib.evalModules {
-      modules = [
-        {
-          options = { inherit tf-netbox-store-ips; };
-          config.tf-netbox-store-ips = {
+  netbox-store-ips = evalOption "tf-netbox-store-ips" tf-netbox-store-ips {
     httpBackend = tfBackend "proxmox-test/store-ips";
     startAddress = "192.168.10.236/24";
     endAddress = "192.168.10.240/24";
   };
-        }
-      ];
-    }).config.tf-netbox-store-ips;
-  netbox-get-ip =
-    (lib.evalModules {
-      modules = [
-        {
-          options = { inherit tf-netbox-get-ip; };
-          config.tf-netbox-get-ip = {
+  netbox-get-ip = evalOption "tf-netbox-get-ip" tf-netbox-get-ip {
     httpBackend = tfBackend "proxmox-test/get-ip";
   };
-        }
-      ];
-    }).config.tf-netbox-get-ip;
   netboxUser = "netbox";
   netboxPassword = "netbox";
   changePassword = pkgs.writeText "change-password.py" ''

deployment/utils.nix

@@ -18,6 +18,19 @@ rec {
       ];
     }).config;
 
+  evalOption =
+    name: opts: conf:
+    (lib.evalModules {
+      modules = [
+        {
+          options = {
+            "${name}" = opts;
+          };
+          config."${name}" = conf;
+        }
+      ];
+    }).config."${name}";
+
   toBash =
     v:
     lib.replaceStrings [ "\"" ] [ "\\\"" ] (