ctucx.git: nixfiles

machines/briefkasten/smarthome: update devices and mqtt-webui

diff --git a/machines/briefkasten/smarthome/mqtt-webui/config.nix b/machines/briefkasten/smarthome/mqtt-webui/config.nix
@@ -98,9 +98,15 @@ in {
       title    = "Smart-Home";
       sections = [
 
+        (DimmableLamp "Hallway" "zigbee2mqtt/ikea_lamp_hallway")
+
+        (DimmableLamp "Living room" "zigbee2mqtt/ikea_lamp_livingroom")
+
+        (DimmableLamp "Sleeping room" "zigbee2mqtt/ikea_lamp_sleepingroom")
+
         (DimmableLamp "Desk" "zigbee2mqtt/tuya_led_stripe_desk")
 
-        (ColorSpectrumLamp "RGB Lamp" "zigbee2mqtt/ikea_lamp_l_rgb")
+        (ColorSpectrumLamp "RGB Lamp" "zigbee2mqtt/ikea_lamp_rgb")
 
         {
           title = "Power-Meter";

diff --git a/machines/briefkasten/smarthome/telegraf.nix b/machines/briefkasten/smarthome/telegraf.nix
@@ -19,7 +19,7 @@
             "lacrosse2mqtt/+"
             "zigbee2mqtt/tuya_sensor_fridge"
             "zigbee2mqtt/tuya_sensor_bathroom"
-            "zigbee2mqtt/tuya_sensor_l"
+            "zigbee2mqtt/tuya_sensor_sleepingroom"
             "zigbee2mqtt/tuya_sensor_l2"
           ];
           data_format = "json";

@@ -29,7 +29,7 @@
       outputs = {
         influxdb_v2 = [
           {
-            urls         = [ "https://influx.home.ctu.cx" ];
+            urls         = [ "http://${toString config.services.influxdb2.settings.http-bind-address}/" ];
             organization = "leah";
             bucket       = "mqttData";
             token        = "\${INFLUX_TOKEN_MQTTDATA}";

diff --git a/machines/briefkasten/smarthome/zigbee2mqtt.nix b/machines/briefkasten/smarthome/zigbee2mqtt.nix
@@ -75,33 +75,19 @@
 
         device_options.retain = true;
         devices = {
-          "0x84fd27fffeaaa597".friendly_name = "ikea_lamp_i";
-          "0x842e14fffe57daae".friendly_name = "ikea_lamp_i_rgb";
-          "0x84fd27fffe6b9ddd".friendly_name = "ikea_lamp_l";
-          "0x94deb8fffe52e639".friendly_name = "ikea_lamp_l_rgb";
-          "0x84fd27fffe44369e".friendly_name = "ikea_lamp_kitchen";
-          "0x84fd27fffe3a0b93".friendly_name = "ikea_lamp_bathroom";
-          "0x84fd27fffea515fc".friendly_name = "ikea_lamp_hallway";
-
-          "0x5c0272fffec9006c".friendly_name = "ikea_remote_i_door";
-          "0x0c4314fffe194ca3".friendly_name = "ikea_remote_i_desk";
+          "0x84fd27fffe6b9ddd".friendly_name = "ikea_lamp_hallway";
+          "0x94deb8fffe52e639".friendly_name = "ikea_lamp_rgb";
+          "0x84fd27fffe44369e".friendly_name = "ikea_lamp_sleepingroom";
+          "0x84fd27fffea515fc".friendly_name = "ikea_lamp_livingroom";
+
           "0x804b50fffe42a74e".friendly_name = "ikea_remote_l_door";
           "0x842e14fffe977bfa".friendly_name = "ikea_remote_l_bed";
-          "0x5c0272fffeca585a".friendly_name = "ikea_remote_kitchen";
-          "0x842e14fffe1ab485".friendly_name = "ikea_remote_bathroom";
-          "0x804b50fffe7df0be".friendly_name = "ikea_remote_hallway_entrancedoor";
-          "0x0c4314fffe194a18".friendly_name = "ikea_remote_hallway";
-
-          "0xcc86ecfffe8bf621".friendly_name = "ikea_control_outlet_i_desk_r";
-          "0x588e81fffebcdc1e".friendly_name = "ikea_control_outlet_i_desk_l";
-
-          "0x847127fffecd89b6".friendly_name = "ikea_motionsensor";
 
           "0xa4c138da0f6d23de".friendly_name = "tuya_led_stripe_desk";
 
           "0xa4c1389d5f391891".friendly_name = "tuya_sensor_fridge";
           "0xa4c13809f76bcdc2".friendly_name = "tuya_sensor_bathroom";
-          "0xa4c13882b76fa1ac".friendly_name = "tuya_sensor_l";
+          "0xa4c13882b76fa1ac".friendly_name = "tuya_sensor_sleepingroom";
           "0xa4c138ebeae2efd2".friendly_name = "tuya_sensor_l2";
         };