tweak catbus-lgtv and catbus-wakeonlan

3 files changed, 19 insertions, 9 deletions

diff --git a/nixos/modules/services/catbus-actuator-lgtv.nix b/nixos/modules/services/catbus-actuator-lgtv.nix
index 73a2c72..051da5b 100644
--- a/nixos/modules/services/catbus-actuator-lgtv.nix
+++ b/nixos/modules/services/catbus-actuator-lgtv.nix
@@ -8,7 +8,12 @@ let
   configJSON = pkgs.writeText "config.json" (builtins.toJSON {
     mqttBroker = "tcp://${cfg.mqttBroker.host}:${toString cfg.mqttBroker.port}";
     apps = cfg.apps;
-    topics = cfg.topics;
+    topics = {
+      app = cfg.topics.input;
+      appValues = cfg.topics.inputValues;
+      power = cfg.topics.power;
+      volume = cfg.topics.volume;
+    };
     tv = cfg.tv;
   });
 
@@ -47,12 +52,12 @@ in {
     };
 
     topics = {
-      app = mkOption {
+      input = mkOption {
         type = types.str;
         description = "MQTT topic for controlling the TV's app";
         example = "home/living-room/tv/app_enum";
       };
-      appValues = mkOption {
+      inputValues = mkOption {
         type = types.str;
         description = "MQTT topic for exporting the TV's apps";
         example = "home/living-room/tv/app_enum/values";
diff --git a/nixos/modules/services/catbus-observer-lgtv.nix b/nixos/modules/services/catbus-observer-lgtv.nix
index e1a293c..9e727f3 100644
--- a/nixos/modules/services/catbus-observer-lgtv.nix
+++ b/nixos/modules/services/catbus-observer-lgtv.nix
@@ -8,7 +8,12 @@ let
   configJSON = pkgs.writeText "config.json" (builtins.toJSON {
     mqttBroker = "tcp://${cfg.mqttBroker.host}:${toString cfg.mqttBroker.port}";
     apps = cfg.apps;
-    topics = cfg.topics;
+    topics = {
+      app = cfg.topics.input;
+      appValues = cfg.topics.inputValues;
+      power = cfg.topics.power;
+      volume = cfg.topics.volume;
+    };
     tv = cfg.tv;
   });
 
@@ -47,12 +52,12 @@ in {
     };
 
     topics = {
-      app = mkOption {
+      input = mkOption {
         type = types.str;
-        description = "MQTT topic for controlling the TV's app";
+        description = "MQTT topic for controlling the TV's input";
         example = "home/living-room/tv/app_enum";
       };
-      appValues = mkOption {
+      inputValues = mkOption {
         type = types.str;
         description = "MQTT topic for exporting the TV's apps";
         example = "home/living-room/tv/app_enum/values";
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3b66e3a..564c76c 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,7 @@
 let
   catbus-lgtv = builtins.fetchGit {
     url = "https://github.com/ethulhu/catbus-lgtv";
-    rev = "6184414321f7f633dbb71cf70ed336e1c42d9d9e";
+    rev = "356f828f055c1d26a8a865a641233569aa24e92c";
   };
   catbus-lifx = builtins.fetchGit {
     url = "https://github.com/ethulhu/catbus-lifx";
@@ -17,7 +17,7 @@ let
   };
   catbus-wakeonlan = builtins.fetchGit {
     url = "https://github.com/ethulhu/catbus-wakeonlan";
-    rev = "54d24cbc56c012f30de902c2746899ffbf9154eb";
+    rev = "748a39954903f9931e2d43d445f1cdae0da15a02";
   };
   catbus-web-ui = builtins.fetchGit {
     url = "https://github.com/ethulhu/catbus-web-ui";