ctucx.git: nixfiles

machines/briefkasten/smarthome: cleanup

diff --git a/machines/briefkasten/smarthome/mqtt-webui/config.nix b/machines/briefkasten/smarthome/mqtt-webui/config.nix
@@ -98,11 +98,11 @@ in {
       title    = "Smart-Home";
       sections = [
 
-        (DimmableLamp "Hallway" "zigbee2mqtt/ikea_lamp_hallway")
+        (WhiteSpectrumLamp "Hallway" "zigbee2mqtt/ikea_lamp_hallway")
 
-        (DimmableLamp "Living room" "zigbee2mqtt/ikea_lamp_livingroom")
+        (WhiteSpectrumLamp "Living room" "zigbee2mqtt/ikea_lamp_livingroom")
 
-        (DimmableLamp "Sleeping room" "zigbee2mqtt/ikea_lamp_sleepingroom")
+        (WhiteSpectrumLamp "Sleeping room" "zigbee2mqtt/ikea_lamp_sleepingroom")
 
         (DimmableLamp "Desk" "zigbee2mqtt/tuya_led_stripe_desk")
 

diff --git a/machines/briefkasten/smarthome/telegraf.nix b/machines/briefkasten/smarthome/telegraf.nix
@@ -31,7 +31,6 @@
             organization = "smarthome";
             bucket       = "mqttData";
             token        = "\${INFLUX_TOKEN_MQTTDATA}";
-            tagdrop.topic = [ "solax2mqtt" ];
           }
         ];
       };

diff --git a/machines/briefkasten/smarthome/zigbee2mqtt.nix b/machines/briefkasten/smarthome/zigbee2mqtt.nix
@@ -88,7 +88,7 @@
 #          "0x804b50fffe42a74e".friendly_name = "ikea_remote_l_door";
 #          "0x842e14fffe977bfa".friendly_name = "ikea_remote_l_bed";
 
-#          "0xa4c138da0f6d23de".friendly_name = "tuya_led_stripe_desk";
+          "0xa4c138da0f6d23de".friendly_name = "tuya_led_stripe_desk";
 
           "0xa4c1389d5f391891".friendly_name = "tuya_sensor_fridge";
           "0xa4c13809f76bcdc2".friendly_name = "tuya_sensor_bathroom";

diff --git a/machines/hector/grafana/default.nix b/machines/hector/grafana/default.nix
@@ -7,11 +7,6 @@
     owner = "grafana";
   };
 
-  age.secrets.grafana-influx-token-solaxData = {
-    file  = ../../../secrets/briefkasten/influx/grafana_token_solaxData.age;
-    owner = "grafana";
-  };
-
   dns.zones."ctu.cx".subdomains.grafana.CNAME = [ "${config.networking.fqdn}." ];
 
   systemd.services.grafana.onFailure = [ "email-notify@%i.service" ];

diff --git a/secrets/briefkasten/influx/grafana_token_solaxData.age b/secrets/briefkasten/influx/grafana_token_solaxData.age
@@ -1,14 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqalR2bGl0MmZIbVF1dDBP
-TytSajFiMXF1Wk9oRUc0YURoYUJSVlRSK2dBClMwcUZmKzlITVIwb1hFODFXOWFm
-UWdVNXd0MzdLSzZpOE5TSlEvZE5QU00KLT4gc3NoLWVkMjU1MTkgNGhLQ013IHk3
-Y0xWYi9mdUphZ3lBZWVsdWdSSGp3YlRVVzcyNTVJSDcxMkkyNGNnQWMKODdrKzJF
-TXh2c2NZTEx3bXVHU0pONDgxa1J0SUk0aUZBdGp6WmMvRjNTRQotPiBzc2gtZWQy
-NTUxOSBxOG9jemcgYUZoK1NIUy9JVDhkL0FWTC9CVzJBNU1kcmt6OTlJaXd0dVRZ
-NUZpTWp6TQp1bVM2cFZiNGN6Y3FwOURScGJJNUlLQ1Q5aGdvUTJLRE4wY0hwZWM5
-c25NCi0+IFonLWdyZWFzZSAzeDE4WzEwIDh6QEJzcW4gR3p7TzcKSHdlMUJiWQot
-LS0gREdXY0EyNVJjQklMc3ZHeWxHQ3dDUU5GejNzL3FOTCsxa28vYm9maG5RQQri
-jxEJWVKrCajeu6cLhOAtkyIy/6eNbhhTih+9+a0cgFv19Sq+m3/lQ6DwglPo146Z
-USJx2ispiPwWeNq5rO2TP8vme0oTOdqhT2eGjDY1anhr+TaQotIgMDqcfvG2zBeV
-6dRAbYDM+wv0raBGiBftdKnAxrJ8ICQ=
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/briefkasten/influx/telegraf_token_solaxData.age b/secrets/briefkasten/influx/telegraf_token_solaxData.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQlVKOEdjK2VWOVdpMERT
-RnFRSVNMVXU0WFVlMVBKTmhYYnUyS3pJMGdrCmo0QlNUK1RNeldPUHlCZ0tTYksw
-VVVibDFYcFlnaFI2cWcxVnFVY0d4UUUKLT4gc3NoLWVkMjU1MTkgNGhLQ013IG5H
-U0RSaXVUUXBFZjZJZkhuR08xMEQ1LzN6TDVYSkFoYW13WUJqd3Q2d3MKUlR2Q1pU
-b2hBemRiQWFVdElUbWxrdTRJZHAySHJ1ZGVLbXFFT2xseUoyYwotPiBVcjdJLG8t
-Z3JlYXNlIGcKSkRid1ZuNnc5dTZhMXg3MklEVnZUZXI3Ykc0U3ljdkVIdWpuSW1U
-V2ZhaXJlNThwL3gzNUhqcHlMbmptd0tWSApUdHBmSXZ6QTllSEdSMUEyalBBeEgw
-S2xWOHNRZXp0cG55eFpOaUUrNnVSYQotLS0gcEIrZWlqeDlUOXhPR0xTWUhwTFFF
-ZlJrWW1TallLODRVSDhKNUVDaVNMbwp6/hNv+meoYuaW2/4Xs9ZGQbMNe/v6KHi+
-RYC1L3LEE2ZoEcVSHpFAoRsrGEnPXeZ129tpaJ4fxX+m6giqTCkrKIEJhLdMRm18
-WJSRWrTq3nDRctR0zwINiqG9xr+ERlBhMqLJSqGMPBm22L0FP976dPQ72uB43do=
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -33,10 +33,8 @@ in {
   "briefkasten/syncthing/cert.age".publicKeys                       = [ main-key briefkasten ];
   "briefkasten/syncthing/htpasswd.age".publicKeys                   = [ main-key briefkasten ];
 
-  "briefkasten/influx/grafana_token_solaxData.age".publicKeys       = [ main-key briefkasten trabbi ];
   "briefkasten/influx/grafana_token_mqttData.age".publicKeys        = [ main-key briefkasten hector ];
   "briefkasten/influx/telegraf_token_mqttData.age".publicKeys       = [ main-key briefkasten ];
-  "briefkasten/influx/telegraf_token_solaxData.age".publicKeys      = [ main-key briefkasten ];
   "briefkasten/influx/master_token.age".publicKeys                  = [ main-key briefkasten ];
   "briefkasten/influx/backup_env.age".publicKeys                    = [ main-key briefkasten ];