configuration/automations/alarm-clock.yaml

@@ -14,48 +14,30 @@
         kelvin: 2000
         brightness: 1
       entity_id: light.bedroom_lights
+    - service: cover.set_cover_position
+      target:
+        entity_id: cover.bedroom_blinds
+      data:
+        position: 10
     - service: light.turn_on
       data:
         kelvin: 5300
         transition: 1800
         brightness: 255
       entity_id: light.bedroom_lights
-    - service: light.turn_on
-      data:
-        kelvin: 5300
-        transition: 1800
-        brightness: 255
-      entity_id: light.bed_lamps
-    - service: light.turn_on
-      data:
-        kelvin: 5300
-        transition: 1800
-        brightness: 255
-      entity_id: light.bed_lightstrip
-    - repeat:
-        count: 10
-        sequence:
-          - service: cover.set_cover_position
-            target:
-              entity_id: cover.bedroom_blinds
-            data:
-              position: "{{ repeat.index * 10 | int }}"
     - delay:
-              seconds: 180
+        minutes: 30
     - service: media_player.volume_set
       data:
         volume_level: 0.1
         entity_id: media_player.bedroom
-    - delay:
+    - delay: '10'
-        seconds: 10
     - service: media_player.play_media
       data:
         entity_id: media_player.bedroom
         media_content_id: 'https://open.spotify.com/playlist/3Qu9kE0ivJIkn76pxTLMFe'
         media_content_type: music
     - service: script.good_morning
-    - delay:
-        minutes: 30
     - service: automation.turn_on
       target:
         entity_id:

configuration/automations/bedroom-motion.yaml

@@ -9,7 +9,7 @@
   condition:
     - condition: numeric_state
       entity_id: sensor.bedroom_motion_illuminance
-      below: '16'
+      below: '21'
     - condition: state
       entity_id: input_select.home_mode
       state: Day

configuration/automations/computer-button.yaml

@@ -10,14 +10,14 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: light.office
+              entity_id: light.table_lamp
               state: 'on'
           sequence:
             - service: light.turn_off
-              entity_id: light.office
+              entity_id: light.table_lamp
         - conditions:
             - condition: state
-              entity_id: light.office
+              entity_id: light.table_lamp
               state: 'off'
           sequence:
             - choose:
@@ -27,7 +27,7 @@
                       state: 'on'
                   sequence:
                     - service: light.turn_on
-                      entity_id: light.office
+                      entity_id: light.table_lamp
                       data:
                         brightness_pct: 100
                         kelvin: 2000
@@ -37,7 +37,7 @@
                       state: 'off'
                   sequence:
                     - service: light.turn_on
-                      entity_id: light.office
+                      entity_id: light.table_lamp
                       data:
                         brightness_pct: 100
                         kelvin: 3200

configuration/automations/f1.yaml

@@ -1,32 +0,0 @@
-- id: f1-automation
-  alias: '[F1] Automation'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: calendar.2021_fia_formula_one_world_championship_race_calendar
-      to: 'on'
-  action:
-    - service: media_player.play_media
-      data:
-        media_content_id: https://open.spotify.com/track/5r7egnfTIQjaKSGREhIky9?si=688bbc2db49a4980
-        media_content_type: music
-      target:
-        entity_id: media_player.bedroom
-    - choose:
-        - conditions:
-            - condition: not
-              conditions:
-                - condition: state
-                  entity_id: media_player.living_room
-                  state: TV
-                  attribute: source
-          sequence:
-            - service: sonos.join
-              data:
-                master: media_player.bedroom
-                entity_id: media_player.living_room
-    - service: sonos.join
-      data:
-        master: media_player.bedroom
-        entity_id: media_player.bathroom
-

configuration/automations/hallway.yaml

@@ -2,24 +2,16 @@
   alias: '[Hallway] Super sensor reset'
   mode: restart
   trigger:
-    - platform: state
+    - entity_id: binary_sensor.hallway_motion_sensor
-      entity_id: binary_sensor.hallway_motion_sensor
       for: 00:00:05
       from: 'off'
+      platform: state
       to: 'on'
   action:
-#    - service: python_script.set_state
+    - data_template:
-#      data_template:
+        entity_id: binary_sensor.hallway_motion_sensor
-#        entity_id: binary_sensor.hallway_motion_sensor
+        state: 'off'
-#        state: 'off'
+      service: python_script.set_state
-    - service: zha.set_zigbee_cluster_attribute
-      data:
-        ieee: 00:15:8d:00:07:75:31:c0
-        endpoint_id: 1
-        cluster_id: 1280
-        cluster_type: in
-        attribute: 2
-        value: '0'
 
 - id: hallway-button
   alias: '[Hallway] Button single press'

configuration/automations/home-music.yaml

@@ -1,76 +0,0 @@
-- id: ra-music-bathroom-arrive
-  alias: '[RA] Bathroom arrive'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.przemyslaws_apple_watch_room_presence
-      to: ra-bathroom
-  condition:
-    - condition: or
-      conditions:
-        - condition: state
-          entity_id: media_player.bedroom
-          state: playing
-  action:
-    - service: sonos.join
-      data:
-        master: media_player.bedroom
-        entity_id: media_player.bathroom
-
-- id: ra-music-bathroom-leave
-  alias: '[RA] Bathroom leave'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.przemyslaws_apple_watch_room_presence
-      from: ra-bathroom
-      for: '0:01:00'
-  condition:
-    - condition: or
-      conditions:
-        - condition: state
-          entity_id: media_player.bathroom
-          state: playing
-  action:
-    - service: sonos.unjoin
-      data:
-        entity_id: media_player.bathroom
-
-- id: ra-music-bedroom-arrive
-  alias: '[RA] Bedroom arrive'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.przemyslaws_apple_watch_room_presence
-      to: ra-bedroom
-  condition:
-    - condition: or
-      conditions:
-        - condition: state
-          entity_id: media_player.bathroom
-          state: playing
-  action:
-    - service: sonos.join
-      data:
-        master: media_player.bathroom
-        entity_id: media_player.bedroom
-
-- id: ra-music-bedroom-leave
-  alias: '[RA] Bedroom leave'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.przemyslaws_apple_watch_room_presence
-      from: ra-bathroom
-      for: '0:01:00'
-  condition:
-    - condition: or
-      conditions:
-        - condition: state
-          entity_id: media_player.bedroom
-          state: playing
-  action:
-    - service: sonos.unjoin
-      data:
-        entity_id: media_player.bedroom
-

configuration/automations/kitchen-motion.yaml

@@ -14,7 +14,7 @@
               state: Day
             - condition: numeric_state
               entity_id: sensor.kitchen_motion_sensor_illuminance
-              below: '16'
+              below: '21'
           sequence:
             - choose:
                 - conditions:

configuration/automations/living-room-button.yaml

@@ -13,14 +13,14 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: light.office
+              entity_id: light.table_lamp
               state: 'on'
           sequence:
             - service: light.turn_off
-              entity_id: light.office
+              entity_id: light.table_lamp
         - conditions:
             - condition: state
-              entity_id: light.office
+              entity_id: light.table_lamp
               state: 'off'
           sequence:
             - choose:
@@ -36,7 +36,7 @@
                               state: 'on'
                           sequence:
                             - service: light.turn_on
-                              entity_id: light.office
+                              entity_id: light.table_lamp
                               data:
                                 brightness_pct: 100
                                 kelvin: 2000
@@ -46,7 +46,7 @@
                               state: 'off'
                           sequence:
                             - service: light.turn_on
-                              entity_id: light.office
+                              entity_id: light.table_lamp
                               data:
                                 brightness_pct: 100
                                 kelvin: 3200
@@ -56,7 +56,7 @@
                       state: Night
                   sequence:
                     - service: light.turn_on
-                      entity_id: light.office
+                      entity_id: light.table_lamp
                       data:
                         brightness_pct: 5
                         kelvin: 2700

configuration/automations/work.yaml

@@ -2,7 +2,7 @@
   alias: '[Work] Daily Warning'
   trigger:
     - platform: time
-      at: '9:30'
+      at: '8:30'
   condition:
     - condition: time
       weekday:
@@ -15,9 +15,6 @@
     - service: light.turn_on
       data:
         brightness_pct: 100
-      entity_id: light.bathroom_color_zha_group_0x0007
-    - service: light.turn_on
-      data:
         hs_color:
           - 120
           - 100
@@ -59,7 +56,7 @@
   alias: '[Work] Daily notification'
   trigger:
     - platform: time
-      at: '9:59'
+      at: '8:55'
   condition:
     - condition: time
       weekday:
@@ -92,7 +89,7 @@
   alias: '[Work] Daily notification off'
   trigger:
     - platform: time
-      at: '10:10'
+      at: '9:10'
   condition:
     - condition: time
       weekday:
@@ -109,11 +106,8 @@
 - id: work_finished
   alias: '[Work] Notify when finished work'
   trigger:
-    - platform: state
+    - platform: time
-      entity_id: device_tracker.amdn4684
+      at: '17:00'
-      for:
-        hours: 8
-      to: home
   condition:
     - condition: time
       weekday:

configuration/configuration.yaml

@@ -14,7 +14,6 @@ http:
     - 192.168.50.101
     - 192.168.50.102
     - 192.168.50.103
-    - 192.168.50.104
   ip_ban_enabled: false
   login_attempts_threshold: 5
 image:
@@ -183,11 +182,6 @@ notify:
     recipient: !secret phone_number
 
 media_player:
-  - platform: androidtv
-    name: Bedroom ATV
-    device_class: androidtv
-    host: 192.168.60.17
-    adbkey: "/config/android/adbkey"
   - platform: androidtv
     name: nVidia Shield
     device_class: androidtv
@@ -312,12 +306,6 @@ calendar:
       - name: "Caffeine free time"
         calendar: "Automations"
         search: "Caffeine free"
-  - platform: caldav
-    url: https://cloud.grondek.pl/remote.php/dav
-    username: pgrondek
-    password: !secret nextcloud_token
-    calendars:
-      - "2021 FIA Formula One World Championship Race Calendar"
 
 ble_monitor:
   #  Xiaomi BT Sensors
@@ -331,28 +319,28 @@ ble_monitor:
   report_unknown: False
   discovery: True
   devices:
-    - name: 'Bedroom sensor [BLE]'
+    - name: 'Bedroom sensor'
       mac: '58:2D:34:3B:67:B0'
     - name: 'Filament Sensor'
       mac: 'A4:C1:38:EC:AE:6B'
     - name: 'Computer Cave sensor'
       mac: 'A4:C1:38:05:3D:AF'
-    - name: 'Bathroom sensor [BLE]'
+    - name: 'Bathroom sensor'
       mac: 'A4:C1:38:49:30:DF'
     - name: 'Rack sensor'
       mac: 'A4:C1:38:5E:F8:84'
     - name: 'Kettle'
       mac: '7C:49:EB:30:61:CE'
-    - name: 'Thuja Plant'
+    - name: 'Thuja Pot'
       mac: 'C4:7C:8D:6C:5B:25'
-    - name: 'Thuja Plant 2'
+    - name: 'Thuja Pot 2'
       mac: 'C4:7C:8D:6C:9F:C6'
-    - name: 'Thuja Plant 3'
+    - name: 'Thuja Pot 3'
       mac: 'C4:7C:8D:6C:9F:9B'
+    - name: 'Bedroom Plant'
+      mac: 'C4:7C:8D:6C:59:D5'
     - name: 'Living Room Plant'
       mac: 'C4:7C:8D:6C:59:D0'
-    - name: 'Living Room Plant 2'
-      mac: 'C4:7C:8D:6C:59:D5'
     - name: 'Weight Scale'
       mac: 'C8:47:8C:D9:6F:96'
 

home-assistant.yml

@@ -25,7 +25,7 @@
             name: Couch Lights
           - entityId: light.desk_lightbar
             name: Desk Lightbar
-          - entityId: light.office
+          - entityId: light.table_lamp
             name: Table lamp
     - name: Copy rest of automations
       copy:

localhost.yml

@@ -17,8 +17,8 @@
             name: Couch Lights
           - entityId: light.desk_lightbar
             name: Desk Lightbar
-          - entityId: light.office
+          - entityId: light.table_lamp
-            name: Office lamp
+            name: Table lamp
     - name: Concat scripts
       ansible.builtin.assemble:
         src: scripts

scripts/10.modes.yaml

@@ -13,7 +13,7 @@ good_night:
         - light.desk_lightbar_ambilight
         - light.couch_lights
         - light.tv_lights
-        - light.office
+        - light.table_lamp
         - light.kitchen_lights
         - light.kitchen_sink_lighstrip
         - light.bathroom_lights
@@ -22,7 +22,7 @@ good_night:
         - light.bathroom_minor_lights
         - light.bedroom_lights
         - light.bed_lightstrip
-        - light.bed_lamps
+        - light.bed_lamp
         - light.hallway_light
         - light.hallway_lightstrip
         - light.computer_computer_cave_background
@@ -31,7 +31,6 @@ good_night:
       entity_id:
         - switch.desk_motor_on_off
         - switch.printer_switch
-        - switch.xmas_lights_on_off
     - service: cover.close_cover
       entity_id:
         - cover.bedroom_blinds
@@ -92,7 +91,7 @@ leave_home:
         - light.desk_lightbar_ambilight
         - light.couch_lights
         - light.tv_lights
-        - light.office
+        - light.table_lamp
         - light.kitchen_lights
         - light.kitchen_sink_lighstrip
         - light.bathroom_lights
@@ -101,7 +100,7 @@ leave_home:
         - light.bathroom_minor_lights
         - light.bedroom_lights
         - light.bed_lightstrip
-        - light.bed_lamps
+        - light.bed_lamp
         - light.hallway_light
         - light.hallway_lightstrip
         - light.computer_computer_cave_background

scripts/91.lights-bedroom.yaml

@@ -54,27 +54,27 @@ bedroom_all_lights_off:
     - service: light.turn_off
       entity_id: light.bed_lightstrip
     - service: light.turn_off
-      entity_id: light.bed_lamps
+      entity_id: light.bed_lamp
 
 bedroom_bed_lamp_toggle:
-  alias: '[Bedroom] Bed lamps toggle'
+  alias: '[Bedroom] Bed lamp toggle'
   sequence:
     - choose:
         - conditions:
             - condition: state
-              entity_id: light.bed_lamps
+              entity_id: light.bed_lamp
               state: 'on'
           sequence:
             - service: script.bedroom_bed_lamp_off
         - conditions:
             - condition: state
-              entity_id: light.bed_lamps
+              entity_id: light.bed_lamp
               state: 'off'
           sequence:
             - service: script.bedroom_bed_lamp_on
 
 bedroom_bed_lamp_on:
-  alias: '[Bedroom] Bed lamps on'
+  alias: '[Bedroom] Bed lamp on'
   sequence:
     - choose:
         - conditions:
@@ -83,19 +83,20 @@ bedroom_bed_lamp_on:
               state: Night
           sequence:
             - service: light.turn_on
-              entity_id: light.bed_lamps
+              entity_id: light.bed_lamp
               data:
                 brightness_pct: 10
                 kelvin: 2000
       default:
         - service: light.turn_on
-          entity_id: light.bed_lamps
+          entity_id: light.bed_lamp
           data:
             brightness_pct: 30
             kelvin: 3200
 
 bedroom_bed_lamp_off:
-  alias: '[Bedroom] Bed lamps off'
+  alias: '[Bedroom] Bed lamp off'
   sequence:
-    - service: light.turn_off
+    - condition: state
-      entity_id: light.bed_lamps
+      entity_id: light.bed_lamp
+      state: 'off'