Update groups and automations

flacjacket · Sep 1, 2024 · 337d86d · 337d86d
1 parent b80e774
commit 337d86d
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 177 deletions.
diff --git a/home_assistant/automations/fridge.yaml b/home_assistant/automations/fridge.yaml
diff --git a/home_assistant/automations/lighting.yaml b/home_assistant/automations/lighting.yaml
@@ -141,49 +141,76 @@
     - platform: numeric_state
       entity_id: sun.sun
       attribute: elevation
-      below: 3
+      below: -1
+      id: living_room_on
+    - platform: time
+      at: "22:00:00"
+      id: living_room_off
     - platform: numeric_state
       entity_id: sun.sun
       attribute: elevation
-      below: -1
-    - platform: time
-      at: "22:30:00"
+      below: 2
+      id: foyer_on
     - platform: time
       at: "23:30:00"
+      id: foyer_off
+    - platform: time
+      at: "23:15:00"
+      id: bedroom_on
+    - platform: time
+      at: "23:45:00"
+      id: bedroom_off
   condition:
     condition: state
     entity_id: input_boolean.vacation
     state: "on"
   action:
-    - if:
-        - condition: trigger
-          id: 0
-      then:
-        - service: light.turn_on
-          target:
-            entity_id: light.foyer_light
-          data:
-            brightness_pct: 60
-    - if:
-        - condition: trigger
-          id: 1
-      then:
-        - service: light.turn_on
-          target:
-            entity_id: light.living_room_light
-          data:
-            brightness_pct: 60
-    - if:
-        - condition: trigger
-          id: 2
-      then:
-        - service: light.turn_off
-          target:
-            entity_id: light.living_room_light
-    - if:
-        - condition: trigger
-          id: 3
-      then:
-        - service: light.turn_off
-          target:
-            entity_id: light.foyer_light
+    - choose:
+      - conditions:
+          - condition: trigger
+            id: foyer_on
+        sequence:
+          - action: light.turn_on
+            target:
+              entity_id: light.foyer_light
+            data:
+              brightness_pct: 60
+      - conditions:
+          - condition: trigger
+            id: foyer_off
+        sequence:
+          - action: light.turn_off
+            target:
+              entity_id: light.foyer_light
+      - conditions:
+          - condition: trigger
+            id: living_room_on
+        sequence:
+          - action: light.turn_on
+            target:
+              entity_id: light.living_room_light
+            data:
+              brightness_pct: 60
+      - conditions:
+          - condition: trigger
+            id: living_room_off
+        sequence:
+          - action: light.turn_off
+            target:
+              entity_id: light.living_room_light
+      - conditions:
+          - condition: trigger
+            id: bedroom_on
+        sequence:
+          - action: light.turn_on
+            target:
+              entity_id: light.main_bedroom_light
+            data:
+              brightness_pct: 60
+      - conditions:
+          - condition: trigger
+            id: bedroom_off
+        sequence:
+          - action: light.turn_off
+            target:
+              entity_id: light.main_bedroom_light
diff --git a/home_assistant/configuration.yaml b/home_assistant/configuration.yaml
@@ -8,11 +8,23 @@ homeassistant:
   currency: USD
   country: US
 
+default_config:
+
 automation manual: !include_dir_merge_list automations/
 automation ui: !include automations.yaml
+notify: !include groups.yaml
 scene: !include scenes.yaml
 script: !include_dir_merge_named scripts/
 
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    - !secret proxy_url
+
+recorder:
+  db_url: !secret mariadb_url
+  purge_keep_days: 30
+
 alexa:
   smart_home:
     endpoint: https://api.amazonalexa.com/v3/events
@@ -43,18 +55,6 @@ alexa:
         - "light.*_follower"
         - "light.*_follower_*"
 
-    #filter:
-    #  include_domains:
-    #    - camera
-    #    - group
-    #    - scene
-    #    - switch
-    #  include_entities:
-    #    - binary_sensor.sensor
-    #    - binary_sensor.sensor_2
-    #    - binary_sensor.sensor_3
-    #    - binary_sensor.sensor_4
-
 #amcrest_nvr:
 #  - name: NVR
 #    host: !secret amcrest_url
@@ -82,89 +82,12 @@ alexa:
 #    name: Front RTSP Camera
 #    input: !secret front_camera_url
 
-#config:
-
-#conversation:
-
-default_config:
-
-#device_tracker:
-
-#discovery:
-
-#ecobee:
-#  api_key: !secret ecobee_api_key
-
-#frontend:
-
-#history:
-
-http:
-  use_x_forwarded_for: true
-  trusted_proxies:
-    - !secret proxy_url
-
-#logbook:
-
-#logger:
-#  default: info
-
-#map:
-
-# enable the mobile app support
-#mobile_app:
-
-notify:
-  - name: doorbell_notify
-    platform: group
-    services:
-      - service: alexa_media
-        data:
-          data:
-            type: tts
-          target:
-            - media_player.kitchen_echo_show
-  - name: laundry_notify
-    platform: group
-    services:
-      - service: alexa_media
-        data:
-          data:
-            type: tts
-          target:
-            - media_player.kitchen_echo_show
-  - name: security_notify
-    platform: group
-    services:
-      - service: mobile_app_moto_x4
-        data:
-          data:
-            channel: security
-            importance: max
-      - service: mobile_app_iphone
-        data:
-          data:
-            push:
-              interruption-level: critical
-
 #panel_iframe:
 #  nodered:
 #    title: "Node-Red"
 #    icon: mdi:shuffle-variant
 #    url: !secret nodered_url
 
-#person:
-
-recorder:
-  db_url: !secret mariadb_url
-  purge_keep_days: 30
-
-#script: !include scripts.yaml
-
-#sensor:
-
-#system_health:
-
 #template:
 #  - binary_sensor:
 #      - name: Alexa Living Room Occupancy
@@ -175,15 +98,3 @@ recorder:
 #tts:
 #  - platform: google_translate
 #    service_name: google_say
-
-#updater:
-
-#zeroconf:
-
-#zone:
-
-#zoneminder:
-#  host: !secret zoneminder_url
-#  username: admin
-#  password: !secret zoneminder_pass
-#  ssl: true
diff --git a/home_assistant/groups.yaml b/home_assistant/groups.yaml
@@ -0,0 +1,23 @@
+- platform: group
+  name: doorbell_notify
+  services:
+    - action: alexa_media
+      data:
+        data:
+          type: tts
+        target:
+          - media_player.kitchen_echo_show
+- platform: group
+  name: laundry_notify
+  services:
+    - action: alexa_media
+      data:
+        data:
+          type: tts
+        target:
+          - media_player.kitchen_echo_show
+- platform: group
+  name: "Phone group"
+  services:
+    - action: mobile_phone_iphone
+    - action: mobile_phone_pixel_7