diff --git a/kitchen-lovelace.yaml b/kitchen-lovelace.yaml index 1fa3014..c984aa1 100644 --- a/kitchen-lovelace.yaml +++ b/kitchen-lovelace.yaml @@ -126,12 +126,6 @@ views: name: Vacuum - type: custom:button-card template: v3_button_brita_water - - type: custom:button-card - template: v3_button - entity: switch.kitchen_outlet - icon: mdi:string-lights - name: Christmas lights - # variables: - # power_sensor: sensor.kitchen_outlet_electric_consumption_w + - !include ./lovelace/popup_cards.yaml diff --git a/lovelace/advanced_dashboard/08_automations.yaml b/lovelace/advanced_dashboard/08_automations.yaml index c5db0e0..f7a2b05 100644 --- a/lovelace/advanced_dashboard/08_automations.yaml +++ b/lovelace/advanced_dashboard/08_automations.yaml @@ -69,8 +69,6 @@ cards: icon: mdi:lightbulb entities: - automation.living_room_candle_turn_on_after_sunset - - automation.kitchen_christmast_lights_turn_on_after_sunset - - automation.kitchen_christmast_lights_turn_off_on_sunrise - automation.lighting_turn_on_ceiling_lights_after_sunset - automation.lighting_turn_off_all_lights_after_sunrise - type: divider diff --git a/lovelace/hallway_dashboard/at_home_dashboard.yaml b/lovelace/hallway_dashboard/at_home_dashboard.yaml index ab8c05c..9e27f55 100644 --- a/lovelace/hallway_dashboard/at_home_dashboard.yaml +++ b/lovelace/hallway_dashboard/at_home_dashboard.yaml @@ -293,14 +293,6 @@ card: show_state: false tap_action: action: more-info - - type: custom:button-card - template: v3_xs_button - entity: input_select.isparkle_color - name: ๐ŸŽ„ L. Room - icon: mdi:string-lights - show_state: false - tap_action: - action: more-info - type: horizontal-stack cards: - type: custom:button-card @@ -319,11 +311,6 @@ card: template: v3_xs_button entity: light.kitchen name: Kitchen - - type: custom:button-card - template: v3_xs_button - entity: switch.kitchen_outlet - icon: mdi:string-lights - name: ๐ŸŽ„ Kitchen - type: horizontal-stack cards: - type: custom:button-card diff --git a/lovelace/home_dashboard/kitchen_dashboard.yaml b/lovelace/home_dashboard/kitchen_dashboard.yaml index 12be16e..f15b411 100644 --- a/lovelace/home_dashboard/kitchen_dashboard.yaml +++ b/lovelace/home_dashboard/kitchen_dashboard.yaml @@ -95,12 +95,6 @@ name: Vacuum - type: custom:button-card template: v3_button_brita_water - - type: custom:button-card - template: v3_button - entity: switch.kitchen_outlet - icon: mdi:string-lights - name: Christmas lights - # variables: - # power_sensor: sensor.kitchen_outlet_electric_consumption_w + - !include ../popup_cards.yaml diff --git a/packages/devices/kitchen/outlet.yaml b/packages/devices/kitchen/outlet.yaml deleted file mode 100644 index 81f9eb1..0000000 --- a/packages/devices/kitchen/outlet.yaml +++ /dev/null @@ -1,15 +0,0 @@ -automation: - - alias: Kitchen christmast lights ยท turn on after sunset - trigger: - platform: sun - event: sunset - action: - - service: switch.turn_on - entity_id: switch.kitchen_outlet - - alias: Kitchen christmast lights ยท turn off on sunrise - trigger: - platform: sun - event: sunrise - action: - - service: switch.turn_off - entity_id: switch.kitchen_outlet diff --git a/packages/routines/good_night.yaml b/packages/routines/good_night.yaml index 23ee5bf..e70a3ce 100644 --- a/packages/routines/good_night.yaml +++ b/packages/routines/good_night.yaml @@ -50,4 +50,3 @@ script: - service: cover.close_cover entity_id: cover.living_room - service: script.living_room_candle_off - - service: script.isparkle_off diff --git a/packages/routines/waking_up.yaml b/packages/routines/waking_up.yaml index 21f8acb..0a1b8b2 100644 --- a/packages/routines/waking_up.yaml +++ b/packages/routines/waking_up.yaml @@ -24,7 +24,6 @@ script: entity_id: - light.living_room_ambient - - service: script.isparkle_on - service: script.open_living_room_cover - service: script.shield_screensaver