Refactor: entity_id outside of data:

config/packages/devices/magic_cube.yaml

@@ -117,8 +117,7 @@ automation:
           state: "music"
     action:
       - service: media_player.media_play_pause
-        data:
+        entity_id: media_player.living_room
-          entity_id: media_player.living_room
 
   - alias: Magic Cube · Music · Volume down on rotate left
     trigger:
@@ -138,8 +137,7 @@ automation:
           state: "music"
     action:
       - service: media_player.volume_down
-        data:
+        entity_id: media_player.living_room
-          entity_id: media_player.living_room
 
   - alias: Magic Cube · Music · Volume up on rotate right
     trigger:
@@ -159,8 +157,7 @@ automation:
           state: "music"
     action:
       - service: media_player.volume_up
-        data:
+        entity_id: media_player.living_room
-          entity_id: media_player.living_room
 
 #
 # ─── CUSTOMIZATION ──────────────────────────────────────────────────────────────

config/packages/modules/lighting/tuya.yaml

@@ -23,12 +23,10 @@ light:
         icon_template: bha:ceiling-lamp-plafond
         turn_on:
           service: input_boolean.turn_on
-          data:
+          entity_id: input_boolean.tuya_kitchen_main_lights_state
-            entity_id: input_boolean.tuya_kitchen_main_lights_state
         turn_off:
           service: input_boolean.turn_off
-          data:
+          entity_id: input_boolean.tuya_kitchen_main_lights_state
-            entity_id: input_boolean.tuya_kitchen_main_lights_state
 
       tuya_kitchen_secondary_lights:
         friendly_name: Kitchen secondary lights (scene)
@@ -36,12 +34,10 @@ light:
         icon_template: bha:ceiling-lamp-plafond
         turn_on:
           service: input_boolean.turn_on
-          data:
+          entity_id: input_boolean.tuya_kitchen_secondary_lights_state
-            entity_id: input_boolean.tuya_kitchen_secondary_lights_state
         turn_off:
           service: input_boolean.turn_off
-          data:
+          entity_id: input_boolean.tuya_kitchen_secondary_lights_state
-            entity_id: input_boolean.tuya_kitchen_secondary_lights_state
 
       tuya_hallway_main_lights:
         friendly_name: Hallway main lights (scene)
@@ -49,12 +45,10 @@ light:
         icon_template: bha:ceiling-lamp-plafond
         turn_on:
           service: input_boolean.turn_on
-          data:
+          entity_id: input_boolean.tuya_hallway_main_lights_state
-            entity_id: input_boolean.tuya_hallway_main_lights_state
         turn_off:
           service: input_boolean.turn_off
-          data:
+          entity_id: input_boolean.tuya_hallway_main_lights_state
-            entity_id: input_boolean.tuya_hallway_main_lights_state
 
       tuya_hallway_entrance_lights:
         friendly_name: Entrance lights (scene)
@@ -62,12 +56,10 @@ light:
         icon_template: bha:ceiling-lamp-plafond
         turn_on:
           service: input_boolean.turn_on
-          data:
+          entity_id: input_boolean.tuya_hallway_entrance_lights_state
-            entity_id: input_boolean.tuya_hallway_entrance_lights_state
         turn_off:
           service: input_boolean.turn_off
-          data:
+          entity_id: input_boolean.tuya_hallway_entrance_lights_state
-            entity_id: input_boolean.tuya_hallway_entrance_lights_state
 
 # Try to keep input_booleans consistent.
 automation:
@@ -96,17 +88,13 @@ automation:
       - delay: 00:00:03
 
       - service_template: "input_boolean.turn_{{ states('light.kitchen_main_lights') }}"
-        data:
+        entity_id: input_boolean.tuya_kitchen_main_lights_state
-          entity_id: input_boolean.tuya_kitchen_main_lights_state
 
       - service_template: "input_boolean.turn_{{ states('light.kitchen_secondary_lights') }}"
-        data:
+        entity_id: input_boolean.tuya_kitchen_secondary_lights_state
-          entity_id: input_boolean.tuya_kitchen_secondary_lights_state
 
       - service_template: "input_boolean.turn_{{ states('light.hallway_main_lights') }}"
-        data:
+        entity_id: input_boolean.tuya_hallway_main_lights_state
-          entity_id: input_boolean.tuya_hallway_main_lights_state
 
       - service_template: "input_boolean.turn_{{ states('light.hallway_entrance_lights') }}"
-        data:
+        entity_id: input_boolean.tuya_hallway_entrance_lights_state
-          entity_id: input_boolean.tuya_hallway_entrance_lights_state

config/packages/modules/media/plex.yaml

@@ -35,14 +35,13 @@ automation:
             - light.tuya_hallway_main_lights
             - light.tuya_kitchen_main_lights
       - service: light.turn_off
-        data:
+        entity_id:
-          entity_id:
+          - light.living_room_main_lights
-            - light.living_room_main_lights
+          - light.pc
-            - light.pc
+          - light.master_bedroom_main_lights
-            - light.master_bedroom_main_lights
+          - light.tuya_hallway_entrance_lights
-            - light.tuya_hallway_entrance_lights
+          - light.tuya_hallway_main_lights
-            - light.tuya_hallway_main_lights
+          - light.tuya_kitchen_main_lights
-            - light.tuya_kitchen_main_lights
 
   - alias: TV · Plex · Restore house after Plex
     trigger:

config/packages/modules/security.yaml

@@ -68,8 +68,8 @@ script:
   alarm_start:
     sequence:
       - service: media_player.play_media
+        entity_id: media_player.master_bedroom
         data:
-          entity_id: media_player.master_bedroom
           media_content_id: "https://raw.githubusercontent.com/saeedsohi/siren/master/FireTrucksSirens.mp3"
           media_content_type: music
       - service: light.turn_on

config/packages/routines/leaving_home.yaml

@@ -10,7 +10,6 @@ script:
           - media_player.nvidia_shield
           - media_player.living_room_tv
       - service: media_player.media_stop
-        data:
+        entity_id: group.all_sonos
-          entity_id: group.all_sonos
       - service: light.turn_off
         entity_id: light.all_lights