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

1 files changed, 55 insertions, 51 deletions

diff --git a/makefu/2configs/bureautomation/multi/matrix.nix b/makefu/2configs/bureautomation/multi/matrix.nix
index 4fcfe8da4..b9b8fc4e8 100644
--- a/makefu/2configs/bureautomation/multi/matrix.nix
+++ b/makefu/2configs/bureautomation/multi/matrix.nix
@@ -8,58 +8,62 @@
 #      name: my_command
 let
   mom_room = "!kTQjvTQvfVsvfEtmth:thales.citadel.team";
-in {
-  matrix =
+in
+{
+  services.home-assistant.config =
   {
-    # secrets:
-    # homeserver, username, password
-    homeserver = "https://ext01.citadel.team";
-    rooms = [
-      mom_room
-    ];
-    commands = [
-    {
-      # alternative: expression for regexp
-      word = "version";
-      name = "version";
-    }
-    {
-      word = "luftqualität";
-      name = "luftqualitaet";
-    }
-  ];
-  }  // (builtins.fromJSON (builtins.readFile
-  <secrets/hass/citadel-bot.json>));
-  automation = [
+    matrix =
     {
-      alias = "React to !version";
-      trigger = {
-        platform = "event";
-        event_type = "matrix_command";
-        event_data.command = "version";
-      };
-      action = {
-        service = "notify.matrix_notify";
-        data_template.message = "Running home-assistant {{states.sensor.current_version.state}}";
-      };
-    }
-    {
-      alias = "React to !luftqualität";
-      trigger = {
-        platform = "event";
-        event_type = "matrix_command";
-        event_data.command = "luftqualitaet";
-      };
-      action = {
-        service = "notify.matrix_notify";
-        data_template.message = ''Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}'';
-      };
-    }
+      # secrets:
+      # homeserver, username, password
+      homeserver = "https://ext01.citadel.team";
+      rooms = [
+        mom_room
+      ];
+      commands = [
+      {
+        # alternative: expression for regexp
+        word = "version";
+        name = "version";
+      }
+      {
+        word = "luftqualität";
+        name = "luftqualitaet";
+      }
+    ];
+    }  // (builtins.fromJSON (builtins.readFile
+    <secrets/hass/citadel-bot.json>));
+    automation = [
+      {
+        alias = "React to !version";
+        trigger = {
+          platform = "event";
+          event_type = "matrix_command";
+          event_data.command = "version";
+        };
+        action = {
+          service = "notify.matrix_notify";
+          data_template.message = "Running home-assistant {{states.sensor.current_version.state}}";
+        };
+      }
+      {
+        alias = "React to !luftqualität";
+        trigger = {
+          platform = "event";
+          event_type = "matrix_command";
+          event_data.command = "luftqualitaet";
+        };
+        action = {
+          service = "notify.matrix_notify";
+          data_template.message = ''Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}'';
+        };
+      }
 
-  ];
-  notify = [{
-    name = "matrix_notify";
-    platform = "matrix";
-    default_room = mom_room;
-  }];
+    ];
+    notify = [{
+      name = "matrix_notify";
+      platform = "matrix";
+      default_room = mom_room;
+    }];
+  };
 }