From 1193fcb1736fd8645cf17ccb9705dd3cc0a64fdb Mon Sep 17 00:00:00 2001 From: Andrew Neisch Date: Fri, 29 Mar 2024 23:18:49 -0500 Subject: [PATCH] Changes --- README.md | 11 ++++---- configuration.yaml | 2 +- .../homeassistant/docker-compose.yml | 2 +- .../docker-compose/other/docker-compose.yml | 6 ++--- .../docker-compose/unified/docker-compose.yml | 8 +++--- packages/frigate.yaml | 27 ++++++++++++------- packages/photo_frames.yaml | 2 +- scene.yaml | 16 ----------- scripts.yaml | 11 +++----- 9 files changed, 36 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index c4011716..862a56e9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions) [![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master) [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity) -[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2024.3.3%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest) +[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2024.4.0b3%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
Buy Me A Coffee @@ -57,7 +57,7 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC Description | value -- | -- Lines of ESPHome YAML | 2801 -Lines of Home Assistant YAML | 9205 +Lines of Home Assistant YAML | 9195 [Integrations](https://www.home-assistant.io/integrations/) in use | 58 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37 @@ -88,20 +88,19 @@ Entities in the [`number`](https://www.home-assistant.io/components/number) doma Entities in the [`person`](https://www.home-assistant.io/components/person) domain | 2 Entities in the [`plant`](https://www.home-assistant.io/components/plant) domain | 1 Entities in the [`remote`](https://www.home-assistant.io/components/remote) domain | 1 -Entities in the [`scene`](https://www.home-assistant.io/components/scene) domain | 2 Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 56 Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 3 Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 442 Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 1 Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1 -Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 164 +Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 165 Entities in the [`timer`](https://www.home-assistant.io/components/timer) domain | 6 Entities in the [`tts`](https://www.home-assistant.io/components/tts) domain | 1 Entities in the [`update`](https://www.home-assistant.io/components/update) domain | 35 Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1 -Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 2 +Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 1 Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 6 -**Total state objects** | **1287** +**Total state objects** | **1285** ## The HACS integrations/plugins that I use: **Appdaemon**:
[aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)
diff --git a/configuration.yaml b/configuration.yaml index 151b89a3..60b5e57b 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -263,7 +263,7 @@ logger: # asyncio: debug homeassistant.components.tts: debug homeassistant.components.pico_tts: debug - + homeassistant.components.google_generative_ai_conversation: debug #zigpy: debug # bellows: debug # zigpy_xbee: debug diff --git a/extras/docker-compose/homeassistant/docker-compose.yml b/extras/docker-compose/homeassistant/docker-compose.yml index 518fd2eb..3f65d9be 100644 --- a/extras/docker-compose/homeassistant/docker-compose.yml +++ b/extras/docker-compose/homeassistant/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.2' services: homeassistant: container_name: homeassistant - image: ghcr.io/home-assistant/home-assistant:stable + image: ghcr.io/home-assistant/home-assistant:beta labels: - com.centurylinklabs.watchtower.monitor-only=true # HTTPS for CF diff --git a/extras/docker-compose/other/docker-compose.yml b/extras/docker-compose/other/docker-compose.yml index 93b0655f..8b8d98bb 100644 --- a/extras/docker-compose/other/docker-compose.yml +++ b/extras/docker-compose/other/docker-compose.yml @@ -569,9 +569,9 @@ services: # - traefik.http.routers.frigate_local.entrypoints=web # - traefik.http.routers.frigate_local.rule=Host(`frigate.home.domain.com`) # - traefik.http.routers.frigate_local.service=frigate - - traefik.http.routers.frigatelocal.entrypoints=web - - traefik.http.routers.frigatelocal.rule=Host(`frigatelocal`) - - traefik.http.routers.frigatelocal.service=frigate + # - traefik.http.routers.frigatelocal.entrypoints=web + # - traefik.http.routers.frigatelocal.rule=Host(`frigatelocal`) + # - traefik.http.routers.frigatelocal.service=frigate # HTTPS Local Only (with 80-->443 redirect) - traefik.http.routers.frigate_local.tls=true - traefik.http.routers.frigate_local.tls.certResolver=le-home diff --git a/extras/docker-compose/unified/docker-compose.yml b/extras/docker-compose/unified/docker-compose.yml index 6637d323..f9c05282 100644 --- a/extras/docker-compose/unified/docker-compose.yml +++ b/extras/docker-compose/unified/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.2' services: homeassistant: container_name: homeassistant - image: ghcr.io/home-assistant/home-assistant:stable + image: ghcr.io/home-assistant/home-assistant:beta labels: - com.centurylinklabs.watchtower.monitor-only=true # HTTPS for CF @@ -799,9 +799,9 @@ services: # - traefik.http.routers.frigate_local.entrypoints=web # - traefik.http.routers.frigate_local.rule=Host(`frigate.home.domain.com`) # - traefik.http.routers.frigate_local.service=frigate - - traefik.http.routers.frigatelocal.entrypoints=web - - traefik.http.routers.frigatelocal.rule=Host(`frigatelocal`) - - traefik.http.routers.frigatelocal.service=frigate + # - traefik.http.routers.frigatelocal.entrypoints=web + # - traefik.http.routers.frigatelocal.rule=Host(`frigatelocal`) + # - traefik.http.routers.frigatelocal.service=frigate # HTTPS Local Only (with 80-->443 redirect) - traefik.http.routers.frigate_local.tls=true - traefik.http.routers.frigate_local.tls.certResolver=le-home diff --git a/packages/frigate.yaml b/packages/frigate.yaml index 94854e04..6b98c328 100644 --- a/packages/frigate.yaml +++ b/packages/frigate.yaml @@ -16,6 +16,8 @@ automation: - alias: Frigate Notification Person id: "frigate_notification_person" mode: single + variables: + generated_content: " " trigger: - platform: mqtt topic: frigate/events @@ -139,6 +141,8 @@ automation: - alias: Doorbell Ring id: "frigate_doorbell_ring" mode: single + variables: + generated_content: " " trigger: - platform: state entity_id: binary_sensor.front_door_button_pressed @@ -149,15 +153,20 @@ automation: filename: /config/media/images/doorbell.jpg target: entity_id: camera.front_door - - service: google_generative_ai_conversation.generate_content continue_on_error: true - data: - prompt: >- - Very briefly describe what you see in this image from my doorbell camera. - Your message needs to be short to fit in a phone notification. Don't - describe stationary objects or buildings. - image_filename: /config/media/images/doorbell.jpg - response_variable: generated_content + - service: siren.turn_on + entity_id: siren.garage_chime_siren + continue_on_error: true + # Broken temporarily? + # - service: google_generative_ai_conversation.generate_content + # continue_on_error: true + # data: + # prompt: >- + # Very briefly describe what you see in this image from my doorbell camera. + # Your message needs to be short to fit in a phone notification. Don't + # describe stationary objects or buildings. + # image_filename: /config/media/images/doorbell.jpg + # response_variable: generated_content - service: notify.signal_frigate data: message: >- @@ -181,8 +190,6 @@ automation: - service: shell_command.weasel_shortcut data: shortcut: open-front-door-cam-weasel - - service: siren.turn_on - entity_id: siren.garage_chime_siren - alias: Frigate Notification Snooze id: "frigate_notification_snooze" diff --git a/packages/photo_frames.yaml b/packages/photo_frames.yaml index 10d5c299..702819d5 100644 --- a/packages/photo_frames.yaml +++ b/packages/photo_frames.yaml @@ -100,7 +100,7 @@ script: entity_id: "{{ entity_id }}" data: #command: "am start -a android.intent.action.VIEW -d 'http://10.0.1.22:8123/api/camera_proxy_stream/camera.front_door_test?token={{ state_attr('camera.front_door_test','access_token')}}'" - command: "am start -n com.android.chrome/com.google.android.apps.chrome.Main -a android.intent.action.VIEW -d 'http://frigatelocal/live/webrtc/webrtc.html?src=front_door'" + command: "am start -n com.android.chrome/com.google.android.apps.chrome.Main -a android.intent.action.VIEW -d 'https://frigate.home.secret/live/webrtc/webrtc.html?src=front_door'" - delay: "00:00:05" - service: androidtv.adb_command target: diff --git a/scene.yaml b/scene.yaml index 94da56ae..e69de29b 100644 --- a/scene.yaml +++ b/scene.yaml @@ -1,16 +0,0 @@ -# Let's only use these to control advanced lighting features. -- name: Master Lamps Slow On - entities: - light.master_bedroom_lamps: - state: on - brightness: 254 - color_temp: 350 - transition: 90 - -- name: Master Lamps Fast On - entities: - light.master_bedroom_lamps: - state: on - brightness: 254 - color_temp: 350 - transition: 2 diff --git a/scripts.yaml b/scripts.yaml index 867ac61d..88f68bac 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -104,14 +104,11 @@ master_bedroom_wakeup: entity_id: switch.master_bedroom_ceiling_fan - delay: "00:00:02" - service: script.appdaemon_ac_morning - - service: scene.turn_on + - service: light.turn_on + target: + entity_id: light.master_bedroom_lamps data: - entity_id: > - {% if 30 > (as_timestamp(now()) - as_timestamp(states.switch.master_bedroom_ceiling_fan.last_changed) | round(0)) %} - scene.master_lamps_slow_on - {% else %} - scene.master_lamps_fast_on - {% endif %} + transition: "{% if 30 > (as_timestamp(now()) - as_timestamp(states.switch.master_bedroom_ceiling_fan.last_changed) | round(0)) %}45{% else %}2{% endif %}" - service: homeassistant.turn_off entity_id: input_boolean.goodnight - service: homeassistant.turn_on