From bbb9c4e9c93f021604da1ee9d953cf483322d21b Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Sat, 7 May 2022 11:12:06 +0300
Subject: [PATCH] or shorthand

---
 config/packages/modules/climate/air_quality.yaml | 16 +++++++---------
 .../packages/modules/lighting/areas/kitchen.yaml | 16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/config/packages/modules/climate/air_quality.yaml b/config/packages/modules/climate/air_quality.yaml
index da5e4b5..9632fd8 100644
--- a/config/packages/modules/climate/air_quality.yaml
+++ b/config/packages/modules/climate/air_quality.yaml
@@ -38,15 +38,13 @@ automation:
       from: "off"
       to: "on"
     condition:
-      - condition: or
-        conditions:
-          - condition: state
-            entity_id:
-              - binary_sensor.kitchen_window
-              - binary_sensor.living_room_right_window
-              - binary_sensor.bedroom_left_window
-              - binary_sensor.bedroom_right_window
-            state: "on"
+      - condition: state
+        entity_id:
+          - binary_sensor.kitchen_window
+          - binary_sensor.living_room_right_window
+          - binary_sensor.bedroom_left_window
+          - binary_sensor.bedroom_right_window
+        state: "on"
     action:
       - service: script.say
         data:
diff --git a/config/packages/modules/lighting/areas/kitchen.yaml b/config/packages/modules/lighting/areas/kitchen.yaml
index 62a5b7d..0c9b5cf 100644
--- a/config/packages/modules/lighting/areas/kitchen.yaml
+++ b/config/packages/modules/lighting/areas/kitchen.yaml
@@ -20,15 +20,13 @@ automation:
               entity_id: light.browser_kitchen
               data:
                 brightness_pct: 100
-            - condition: or
-              conditions:
-                - condition: or
-                  conditions:
-                    - condition: sun
-                      after: sunset
-                      after_offset: "-01:00:00"
-                    - condition: sun
-                      before: sunrise
+            - or:
+                - or:
+                  - condition: sun
+                    after: sunset
+                    after_offset: "-01:00:00"
+                  - condition: sun
+                    before: sunrise
                 - condition: numeric_state
                   entity_id: sensor.dark_sky_cloud_coverage
                   above: 80