From 1690fcb265b52a2ae1d237c0aed67ff873e5164a Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sat, 8 Nov 2025 21:05:45 +0100
Subject: [PATCH] simplify helper function `evalOption` to drop the first
 parameter (#580)

Reviewed-on: https://git.fediversity.eu/fediversity/fediversity/pulls/580
---
 deployment/check/netbox-ips/nixosTest.nix |  4 ++--
 deployment/utils.nix                      | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/deployment/check/netbox-ips/nixosTest.nix b/deployment/check/netbox-ips/nixosTest.nix
index 2d64723f..78cfb327 100644
--- a/deployment/check/netbox-ips/nixosTest.nix
+++ b/deployment/check/netbox-ips/nixosTest.nix
@@ -17,12 +17,12 @@ let
     tf-netbox-store-ips
     tf-netbox-get-ip
     ;
-  netbox-store-ips = evalOption "tf-netbox-store-ips" tf-netbox-store-ips {
+  netbox-store-ips = evalOption tf-netbox-store-ips {
     httpBackend = tfBackend "proxmox-test/store-ips";
     startAddress = "192.168.10.236/24";
     endAddress = "192.168.10.240/24";
   };
-  netbox-get-ip = evalOption "tf-netbox-get-ip" tf-netbox-get-ip {
+  netbox-get-ip = evalOption tf-netbox-get-ip {
     httpBackend = tfBackend "proxmox-test/get-ip";
   };
   netboxUser = "netbox";
diff --git a/deployment/utils.nix b/deployment/utils.nix
index d923275c..16abdede 100644
--- a/deployment/utils.nix
+++ b/deployment/utils.nix
@@ -28,17 +28,15 @@ rec {
     }).config;
 
   evalOption =
-    name: opts: conf:
+    opts: conf:
     (lib.evalModules {
       modules = [
         {
-          options = {
-            "${name}" = opts;
-          };
-          config."${name}" = conf;
+          options.opt = opts;
+          config.opt = conf;
         }
       ];
-    }).config."${name}";
+    }).config.opt;
 
   toBash =
     v: