catbus mqttBroker parameters are URLs

1 files changed, 5 insertions, 12 deletions

diff --git a/nixos/modules/services/catbus-observer-networkpresence.nix b/nixos/modules/services/catbus-observer-networkpresence.nix
index 528ab66..da54956 100644
--- a/nixos/modules/services/catbus-observer-networkpresence.nix
+++ b/nixos/modules/services/catbus-observer-networkpresence.nix
@@ -6,7 +6,7 @@ let
   cfg = config.eth.services.catbus-observer-networkpresence;
 
   configJSON = pkgs.writeText "config.json" (builtins.toJSON {
-    mqttBroker = "tcp://${cfg.mqttBroker.host}:${toString cfg.mqttBroker.port}";
+    mqttBroker = cfg.mqttBroker;
     devices = cfg.devices;
   });
 
@@ -23,17 +23,10 @@ in {
       example = "enp2s0";
     };
 
-    mqttBroker = {
-      host = mkOption {
-        type = types.str;
-        description = "Host of the MQTT broker.";
-        example = "localhost";
-      };
-      port = mkOption {
-        type = types.int;
-        description = "Port of the MQTT broker.";
-        default = 1883;
-      };
+    mqttBroker = mkOption {
+      type = types.str;
+      description = "URL of the MQTT broker.";
+      example = "tcp://broker.local:1883";
     };
 
     devices = mkOption {