diff --git a/.gitignore b/.gitignore index 7583652..21cd2bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,8 @@ !.gitignore !*.md !*.skel -!/automations/ -!/lovelace-views/ +!/config/ !/scripts/ -!/sensors/ !/tileboard/ !/www/ diff --git a/config/alerts/humidity.yaml b/config/alerts/humidity.yaml new file mode 100644 index 0000000..ee2476a --- /dev/null +++ b/config/alerts/humidity.yaml @@ -0,0 +1,5 @@ +#motion_battery: +# entity_id: binary_sensor.humidity_alarm_parents_bathroom +# repeat: 30 +# notifiers: +# - telegram_fb \ No newline at end of file diff --git a/alexa.yaml b/config/alexa.yaml similarity index 100% rename from alexa.yaml rename to config/alexa.yaml diff --git a/automations/alarm.yaml b/config/automations/alarm.yaml similarity index 100% rename from automations/alarm.yaml rename to config/automations/alarm.yaml diff --git a/automations/hassio.yaml b/config/automations/hassio.yaml similarity index 100% rename from automations/hassio.yaml rename to config/automations/hassio.yaml diff --git a/automations/humidity.yaml b/config/automations/humidity.yaml similarity index 100% rename from automations/humidity.yaml rename to config/automations/humidity.yaml diff --git a/automations/livingroom.yaml b/config/automations/livingroom.yaml similarity index 100% rename from automations/livingroom.yaml rename to config/automations/livingroom.yaml diff --git a/automations/roku.yaml b/config/automations/roku.yaml similarity index 100% rename from automations/roku.yaml rename to config/automations/roku.yaml diff --git a/automations/theme-switch.yaml b/config/automations/theme-switch.yaml similarity index 100% rename from automations/theme-switch.yaml rename to config/automations/theme-switch.yaml diff --git a/automations/wallboard.yaml b/config/automations/wallboard.yaml similarity index 100% rename from automations/wallboard.yaml rename to config/automations/wallboard.yaml diff --git a/config/customizations/misc.yaml b/config/customizations/misc.yaml new file mode 100644 index 0000000..7286aee --- /dev/null +++ b/config/customizations/misc.yaml @@ -0,0 +1,4 @@ +person.jenny: + entity_picture: "/local/avatars/jenny-bty.jpg" +person.florian: + entity_picture: "/local/avatars/flo-mtb.jpg" \ No newline at end of file diff --git a/scripts.yaml b/config/scripts.yaml similarity index 98% rename from scripts.yaml rename to config/scripts.yaml index 57dc8d0..f87966a 100644 --- a/scripts.yaml +++ b/config/scripts.yaml @@ -27,7 +27,7 @@ livingroom_music_scenario_on: - service: light.turn_on data: entity_id: light.ambilight - rgb_color: [0,255,62] # Spotify Green + effect: "Rainbow swirl" brightness: 130 - service: media_player.select_source data: diff --git a/sensors/devices.yaml b/config/sensors/devices.yaml similarity index 100% rename from sensors/devices.yaml rename to config/sensors/devices.yaml diff --git a/sensors/livingroom.yaml b/config/sensors/livingroom.yaml similarity index 100% rename from sensors/livingroom.yaml rename to config/sensors/livingroom.yaml diff --git a/sensors/misc.yaml b/config/sensors/misc.yaml similarity index 100% rename from sensors/misc.yaml rename to config/sensors/misc.yaml diff --git a/sensors/mqtt.yaml b/config/sensors/mqtt.yaml similarity index 100% rename from sensors/mqtt.yaml rename to config/sensors/mqtt.yaml diff --git a/sensors/social.yaml b/config/sensors/social.yaml similarity index 100% rename from sensors/social.yaml rename to config/sensors/social.yaml diff --git a/switches.yaml b/config/switches.yaml similarity index 100% rename from switches.yaml rename to config/switches.yaml diff --git a/lovelace-views/cctv.yaml b/config/views/cctv.yaml similarity index 100% rename from lovelace-views/cctv.yaml rename to config/views/cctv.yaml diff --git a/lovelace-views/devices.yaml b/config/views/devices.yaml similarity index 100% rename from lovelace-views/devices.yaml rename to config/views/devices.yaml diff --git a/lovelace-views/humidity.yaml b/config/views/humidity.yaml similarity index 92% rename from lovelace-views/humidity.yaml rename to config/views/humidity.yaml index f3a4202..342b646 100644 --- a/lovelace-views/humidity.yaml +++ b/config/views/humidity.yaml @@ -44,14 +44,14 @@ cards: - type: horizontal-stack cards: - type: sensor - entity: sensor.humidity_12 + entity: sensor.lumi_bedroom_humidity name: Luftfeuchtigkeit graph: line unit: "%" detail: 2 hours_to_show: 12 - type: sensor - entity: sensor.temperature_11 + entity: sensor.lumi_bedroom_temperature name: Temperatur graph: line unit: °C @@ -62,14 +62,14 @@ cards: - type: horizontal-stack cards: - type: sensor - entity: sensor.humidity_18 + entity: sensor.lumi_guestroom_humidity name: Luftfeuchtigkeit graph: line unit: "%" detail: 2 hours_to_show: 12 - type: sensor - entity: sensor.temperature_17 + entity: sensor.lumi_guestroom_temperature name: Temperatur graph: line unit: °C @@ -118,14 +118,14 @@ cards: - type: horizontal-stack cards: - type: sensor - entity: sensor.humidity_15 + entity: sensor.lumi_office_humidity name: Luftfeuchtigkeit graph: line unit: "%" detail: 2 hours_to_show: 12 - type: sensor - entity: sensor.temperature_14 + entity: sensor.lumi_office_temperature name: Temperatur graph: line unit: °C diff --git a/lovelace-views/instagram.yaml b/config/views/instagram.yaml similarity index 100% rename from lovelace-views/instagram.yaml rename to config/views/instagram.yaml diff --git a/lovelace-views/lights.yaml b/config/views/lights.yaml similarity index 100% rename from lovelace-views/lights.yaml rename to config/views/lights.yaml diff --git a/lovelace-views/livingroom.yaml b/config/views/livingroom.yaml similarity index 100% rename from lovelace-views/livingroom.yaml rename to config/views/livingroom.yaml diff --git a/lovelace-views/overview.yaml b/config/views/overview.yaml similarity index 100% rename from lovelace-views/overview.yaml rename to config/views/overview.yaml diff --git a/lovelace-views/spotify.yaml b/config/views/spotify.yaml similarity index 100% rename from lovelace-views/spotify.yaml rename to config/views/spotify.yaml diff --git a/configuration.yaml b/configuration.yaml index 1c90827..11ca365 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -5,7 +5,7 @@ homeassistant: elevation: !secret home_elevation unit_system: metric time_zone: Europe/Berlin - customize: !include_dir_merge_named customizations/ + customize: !include_dir_merge_named config/customizations/ auth_providers: - type: homeassistant - type: trusted_networks @@ -303,10 +303,10 @@ tplink: switch: - host: !secret tplink_ip -#alert: !include_dir_merge_list alerts/ -alexa: !include alexa.yaml -automation: !include_dir_merge_list automations/ -#scene: !include scenes.yaml -script: !include scripts.yaml -sensor: !include_dir_merge_list sensors/ -switch: !include switches.yaml +alert: !include_dir_merge_list config/alerts/ +alexa: !include config/alexa.yaml +automation: !include_dir_merge_list config/automations/ +scene: !include_dir_merge_list config/scenes/ +script: !include config/scripts.yaml +sensor: !include_dir_merge_list config/sensors/ +switch: !include config/switches.yaml diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 6a3f37a..cc3aa4d 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -2,14 +2,14 @@ title: Making Home Great Again views: - - !include lovelace-views/overview.yaml - - !include lovelace-views/lights.yaml - - !include lovelace-views/livingroom.yaml - - !include lovelace-views/humidity.yaml - - !include lovelace-views/spotify.yaml - - !include lovelace-views/instagram.yaml - - !include lovelace-views/devices.yaml - - !include lovelace-views/cctv.yaml + - !include config/views/overview.yaml + - !include config/views/lights.yaml + - !include config/views/livingroom.yaml + - !include config/views/humidity.yaml + - !include config/views/spotify.yaml + - !include config/views/instagram.yaml + - !include config/views/devices.yaml + - !include config/views/cctv.yaml resources: - url: https://cdn.jsdelivr.net/gh/bramkragten/custom-ui@master/weather-card/weather-card.min.js