Merge remote-tracking branch 'gum/master' into master

5 files changed, 52 insertions, 58 deletions

diff --git a/makefu/2configs/bureautomation/sensor/airquality.nix b/makefu/2configs/bureautomation/sensor/airquality.nix
index 217fa9595..7d95c3c15 100644
--- a/makefu/2configs/bureautomation/sensor/airquality.nix
+++ b/makefu/2configs/bureautomation/sensor/airquality.nix
@@ -1,9 +1,12 @@
-[
-  # coming from 2configs/stats/telegraf/
-  { platform = "mqtt";
-    name = "Air Quality";
-    state_topic = "/telegraf/wbob/airquality";
-    value_template = "{{ value_json.fields.value }}";
-    unit_of_measurement = "VOC";
-  }
-]
+{
+  services.home-assistant.config.sensor =
+  [
+    # coming from 2configs/stats/telegraf/
+    { platform = "mqtt";
+      name = "Air Quality";
+      state_topic = "/telegraf/wbob/airquality";
+      value_template = "{{ value_json.fields.value }}";
+      unit_of_measurement = "VOC";
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/sensor/espeasy.nix b/makefu/2configs/bureautomation/sensor/espeasy.nix
index 4b78ee84e..c68f39f1a 100644
--- a/makefu/2configs/bureautomation/sensor/espeasy.nix
+++ b/makefu/2configs/bureautomation/sensor/espeasy.nix
@@ -24,8 +24,10 @@ let
     payload_available = "Online";
     payload_not_available = "Offline";
   };
-in
-(espeasy_dht22 "easy1") ++
-(espeasy_dht22 "easy2") ++ [
-  (espeasy_ds18 "easy3" )
-]
+in {
+  services.home-assistant.config.sensor =
+    (espeasy_dht22 "easy1") ++
+    (espeasy_dht22 "easy2") ++ [
+    (espeasy_ds18 "easy3" )
+  ];
+}
diff --git a/makefu/2configs/bureautomation/sensor/influxdb.nix b/makefu/2configs/bureautomation/sensor/influxdb.nix
deleted file mode 100644
index 820a56c4d..000000000
--- a/makefu/2configs/bureautomation/sensor/influxdb.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  #{ platform = "influxdb";
-  #  queries = [
-  #    { name = "mean value of feinstaub P1";
-  #      where = '' "node" = 'esp8266-1355142' '';
-  #      measurement = "feinstaub";
-  #      database = "telegraf";
-  #      field = "P1";
-  #    }
-  #    { name = "mean value of feinstaub P2";
-  #      where = '' "node" = 'esp8266-1355142' '';
-  #      measurement = "feinstaub";
-  #      database = "telegraf";
-  #      field = "P2";
-  #    }
-  #  ];
-  #}
-]
diff --git a/makefu/2configs/bureautomation/sensor/outside.nix b/makefu/2configs/bureautomation/sensor/outside.nix
index 596473f17..b5d25ecd3 100644
--- a/makefu/2configs/bureautomation/sensor/outside.nix
+++ b/makefu/2configs/bureautomation/sensor/outside.nix
@@ -1,25 +1,29 @@
-{lib,...}: [
-  { platform = "darksky";
-    api_key = lib.removeSuffix "\n"
-      (builtins.readFile <secrets/hass/darksky.apikey>);
-    language = "de";
-    monitored_conditions = [
-      "summary" "icon"
-      "nearest_storm_distance" "precip_probability"
-      "precip_intensity"
-      "temperature" # "temperature_high" "temperature_low"
-      "apparent_temperature"
-      "hourly_summary" # next 24 hours text
-      "humidity"
-      "pressure"
-      "uv_index"
-    ];
-    units =  "si" ;
-    scan_interval = "00:30:00";
-  }
-  { platform = "luftdaten";
-    name = "Ditzingen";
-    sensorid = "5341";
-    monitored_conditions = [ "P1" "P2" ];
-  }
-  ]
+{lib,...}:
+{
+  services.home-assistant.config.sensor =
+  [
+    { platform = "darksky";
+      api_key = lib.removeSuffix "\n"
+        (builtins.readFile <secrets/hass/darksky.apikey>);
+      language = "de";
+      monitored_conditions = [
+        "summary" "icon"
+        "nearest_storm_distance" "precip_probability"
+        "precip_intensity"
+        "temperature" # "temperature_high" "temperature_low"
+        "apparent_temperature"
+        "hourly_summary" # next 24 hours text
+        "humidity"
+        "pressure"
+        "uv_index"
+      ];
+      units =  "si" ;
+      scan_interval = "00:30:00";
+    }
+    { platform = "luftdaten";
+      name = "Ditzingen";
+      sensorid = "5341";
+      monitored_conditions = [ "P1" "P2" ];
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix b/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix
index 1a4738e12..f5f063dbf 100644
--- a/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix
+++ b/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix
@@ -9,8 +9,11 @@ let
   payload_not_available= "Offline";
   };
 in
+{
+  services.home-assistant.config.sensor =
   map tasmota_firmware [
     "plug" "plug2" "plug3" "plug4" "plug5"
     "status1" "status2" "buslicht"
     "rfbridge"
-  ]
+  ];
+}