use types.attrsOf for option sets for some daemons

1 files changed, 20 insertions, 25 deletions

diff --git a/nixos/modules/services/catbus-observer-networkpresence.nix b/nixos/modules/services/catbus-observer-networkpresence.nix
index be48e27..528ab66 100644
--- a/nixos/modules/services/catbus-observer-networkpresence.nix
+++ b/nixos/modules/services/catbus-observer-networkpresence.nix
@@ -5,18 +5,10 @@ let
 
   cfg = config.eth.services.catbus-observer-networkpresence;
 
-  configJSON = pkgs.writeText "config.json" ''
-      {
-        "mqttBroker": "tcp://${cfg.mqttBroker.host}:${toString cfg.mqttBroker.port}",
-
-        "devices": {
-          "TV": {
-            "mac": "${cfg.devices.tv.mac}",
-            "topic": "${cfg.devices.tv.topic}"
-          }
-        }
-      }
-  '';
+  configJSON = pkgs.writeText "config.json" (builtins.toJSON {
+    mqttBroker = "tcp://${cfg.mqttBroker.host}:${toString cfg.mqttBroker.port}";
+    devices = cfg.devices;
+  });
 
 in {
 
@@ -44,20 +36,23 @@ in {
       };
     };
 
-    # TODO: replace this with a proper set of option sets.
-    devices = {
-      tv = {
-        mac = mkOption {
-          type = types.str;
-          description = "The device's MAC address";
-          example = "aa:bb:cc:dd:ee:ff";
+    devices = mkOption {
+      type = types.attrsOf (types.submodule {
+        options = {
+          mac = mkOption {
+            type = types.str;
+            description = "The device's MAC address";
+            example = "aa:bb:cc:dd:ee:ff";
+          };
+          topic = mkOption {
+            type = types.str;
+            description = "MQTT topic for controlling the device";
+            example = "home/house/speakers/power";
+          };
         };
-        topic = mkOption {
-          type = types.str;
-          description = "MQTT topic for controlling the device";
-          example = "home/house/speakers/power";
-        };
-      };
+      });
+      example = { TV = { mac = "aa:bb:cc:dd:ee:ff"; topic = "home/living-room/tv/power"; }; };
+      description = "A set of devices and their MACs & controller topics.";
     };
   };