From d79f64c060ce24d575954b98be1103c0ad2861b1 Mon Sep 17 00:00:00 2001 From: pgrondek Date: Mon, 24 May 2021 20:26:03 +0200 Subject: [PATCH] Reorganize files --- .../{files/automations => }/3d-printer.yaml | 0 .../{files/automations => }/alarm-clock.yaml | 0 .../{files/automations => }/alarm.yaml | 0 .../automations => }/bathroom-button.yaml | 0 .../automations => }/bathroom-door.yaml | 0 .../bathroom-mirror-button.yaml | 0 .../automations => }/bathroom-motion.yaml | 0 .../bathroom-music-button.yaml | 0 .../automations => }/bathroom-music.yaml | 0 .../bathroom-shower-motion.yaml | 0 .../bathroom-washing-machine.yaml | 0 .../automations => }/bedroom-button.yaml | 0 .../automations => }/bedroom-humidifier.yaml | 0 .../automations => }/bedroom-motion.yaml | 0 .../{files/automations => }/behaviour-tv.yaml | 0 .../automations => }/computer-button.yaml | 0 .../automations => }/computer-lights.yaml | 0 .../{files/automations => }/computer.yaml | 0 .../{files/automations => }/goto-sleep.yaml | 0 .../automations => }/hallway-doorbell.yaml | 0 .../automations => }/hallway-motion.yaml | 0 .../automations => }/kitchen-button.yaml | 0 .../automations => }/kitchen-motion.yaml | 0 .../{files/automations => }/modes.yaml | 0 .../automations => }/phone-automations.yaml | 0 automations/tasks/main.yaml | 5 ---- .../automations => }/tv-automations.yaml | 0 .../{files/automations => }/vacuum.yaml | 0 automations/vars/main.yaml | 17 -------------- .../{files/automations => }/work-daily.yaml | 0 .../automations => }/work-finished.yaml | 0 .../configuration.yaml => configuration.yaml | 10 ++++---- home-assistant.yml | 23 +++++++++++++++++-- .../files/scripts => scripts}/android-tv.yaml | 0 .../files/scripts => scripts}/modes.yaml | 0 .../scripts => scripts}/pause-all-media.yaml | 0 .../templates => templates}/lights.yaml.j2 | 0 37 files changed, 26 insertions(+), 29 deletions(-) rename automations/{files/automations => }/3d-printer.yaml (100%) rename automations/{files/automations => }/alarm-clock.yaml (100%) rename automations/{files/automations => }/alarm.yaml (100%) rename automations/{files/automations => }/bathroom-button.yaml (100%) rename automations/{files/automations => }/bathroom-door.yaml (100%) rename automations/{files/automations => }/bathroom-mirror-button.yaml (100%) rename automations/{files/automations => }/bathroom-motion.yaml (100%) rename automations/{files/automations => }/bathroom-music-button.yaml (100%) rename automations/{files/automations => }/bathroom-music.yaml (100%) rename automations/{files/automations => }/bathroom-shower-motion.yaml (100%) rename automations/{files/automations => }/bathroom-washing-machine.yaml (100%) rename automations/{files/automations => }/bedroom-button.yaml (100%) rename automations/{files/automations => }/bedroom-humidifier.yaml (100%) rename automations/{files/automations => }/bedroom-motion.yaml (100%) rename automations/{files/automations => }/behaviour-tv.yaml (100%) rename automations/{files/automations => }/computer-button.yaml (100%) rename automations/{files/automations => }/computer-lights.yaml (100%) rename automations/{files/automations => }/computer.yaml (100%) rename automations/{files/automations => }/goto-sleep.yaml (100%) rename automations/{files/automations => }/hallway-doorbell.yaml (100%) rename automations/{files/automations => }/hallway-motion.yaml (100%) rename automations/{files/automations => }/kitchen-button.yaml (100%) rename automations/{files/automations => }/kitchen-motion.yaml (100%) rename automations/{files/automations => }/modes.yaml (100%) rename automations/{files/automations => }/phone-automations.yaml (100%) delete mode 100644 automations/tasks/main.yaml rename automations/{files/automations => }/tv-automations.yaml (100%) rename automations/{files/automations => }/vacuum.yaml (100%) delete mode 100644 automations/vars/main.yaml rename automations/{files/automations => }/work-daily.yaml (100%) rename automations/{files/automations => }/work-finished.yaml (100%) rename automations/files/configuration.yaml => configuration.yaml (99%) rename {automations/files/scripts => scripts}/android-tv.yaml (100%) rename {automations/files/scripts => scripts}/modes.yaml (100%) rename {automations/files/scripts => scripts}/pause-all-media.yaml (100%) rename {automations/templates => templates}/lights.yaml.j2 (100%) diff --git a/automations/files/automations/3d-printer.yaml b/automations/3d-printer.yaml similarity index 100% rename from automations/files/automations/3d-printer.yaml rename to automations/3d-printer.yaml diff --git a/automations/files/automations/alarm-clock.yaml b/automations/alarm-clock.yaml similarity index 100% rename from automations/files/automations/alarm-clock.yaml rename to automations/alarm-clock.yaml diff --git a/automations/files/automations/alarm.yaml b/automations/alarm.yaml similarity index 100% rename from automations/files/automations/alarm.yaml rename to automations/alarm.yaml diff --git a/automations/files/automations/bathroom-button.yaml b/automations/bathroom-button.yaml similarity index 100% rename from automations/files/automations/bathroom-button.yaml rename to automations/bathroom-button.yaml diff --git a/automations/files/automations/bathroom-door.yaml b/automations/bathroom-door.yaml similarity index 100% rename from automations/files/automations/bathroom-door.yaml rename to automations/bathroom-door.yaml diff --git a/automations/files/automations/bathroom-mirror-button.yaml b/automations/bathroom-mirror-button.yaml similarity index 100% rename from automations/files/automations/bathroom-mirror-button.yaml rename to automations/bathroom-mirror-button.yaml diff --git a/automations/files/automations/bathroom-motion.yaml b/automations/bathroom-motion.yaml similarity index 100% rename from automations/files/automations/bathroom-motion.yaml rename to automations/bathroom-motion.yaml diff --git a/automations/files/automations/bathroom-music-button.yaml b/automations/bathroom-music-button.yaml similarity index 100% rename from automations/files/automations/bathroom-music-button.yaml rename to automations/bathroom-music-button.yaml diff --git a/automations/files/automations/bathroom-music.yaml b/automations/bathroom-music.yaml similarity index 100% rename from automations/files/automations/bathroom-music.yaml rename to automations/bathroom-music.yaml diff --git a/automations/files/automations/bathroom-shower-motion.yaml b/automations/bathroom-shower-motion.yaml similarity index 100% rename from automations/files/automations/bathroom-shower-motion.yaml rename to automations/bathroom-shower-motion.yaml diff --git a/automations/files/automations/bathroom-washing-machine.yaml b/automations/bathroom-washing-machine.yaml similarity index 100% rename from automations/files/automations/bathroom-washing-machine.yaml rename to automations/bathroom-washing-machine.yaml diff --git a/automations/files/automations/bedroom-button.yaml b/automations/bedroom-button.yaml similarity index 100% rename from automations/files/automations/bedroom-button.yaml rename to automations/bedroom-button.yaml diff --git a/automations/files/automations/bedroom-humidifier.yaml b/automations/bedroom-humidifier.yaml similarity index 100% rename from automations/files/automations/bedroom-humidifier.yaml rename to automations/bedroom-humidifier.yaml diff --git a/automations/files/automations/bedroom-motion.yaml b/automations/bedroom-motion.yaml similarity index 100% rename from automations/files/automations/bedroom-motion.yaml rename to automations/bedroom-motion.yaml diff --git a/automations/files/automations/behaviour-tv.yaml b/automations/behaviour-tv.yaml similarity index 100% rename from automations/files/automations/behaviour-tv.yaml rename to automations/behaviour-tv.yaml diff --git a/automations/files/automations/computer-button.yaml b/automations/computer-button.yaml similarity index 100% rename from automations/files/automations/computer-button.yaml rename to automations/computer-button.yaml diff --git a/automations/files/automations/computer-lights.yaml b/automations/computer-lights.yaml similarity index 100% rename from automations/files/automations/computer-lights.yaml rename to automations/computer-lights.yaml diff --git a/automations/files/automations/computer.yaml b/automations/computer.yaml similarity index 100% rename from automations/files/automations/computer.yaml rename to automations/computer.yaml diff --git a/automations/files/automations/goto-sleep.yaml b/automations/goto-sleep.yaml similarity index 100% rename from automations/files/automations/goto-sleep.yaml rename to automations/goto-sleep.yaml diff --git a/automations/files/automations/hallway-doorbell.yaml b/automations/hallway-doorbell.yaml similarity index 100% rename from automations/files/automations/hallway-doorbell.yaml rename to automations/hallway-doorbell.yaml diff --git a/automations/files/automations/hallway-motion.yaml b/automations/hallway-motion.yaml similarity index 100% rename from automations/files/automations/hallway-motion.yaml rename to automations/hallway-motion.yaml diff --git a/automations/files/automations/kitchen-button.yaml b/automations/kitchen-button.yaml similarity index 100% rename from automations/files/automations/kitchen-button.yaml rename to automations/kitchen-button.yaml diff --git a/automations/files/automations/kitchen-motion.yaml b/automations/kitchen-motion.yaml similarity index 100% rename from automations/files/automations/kitchen-motion.yaml rename to automations/kitchen-motion.yaml diff --git a/automations/files/automations/modes.yaml b/automations/modes.yaml similarity index 100% rename from automations/files/automations/modes.yaml rename to automations/modes.yaml diff --git a/automations/files/automations/phone-automations.yaml b/automations/phone-automations.yaml similarity index 100% rename from automations/files/automations/phone-automations.yaml rename to automations/phone-automations.yaml diff --git a/automations/tasks/main.yaml b/automations/tasks/main.yaml deleted file mode 100644 index 3a35022..0000000 --- a/automations/tasks/main.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Build lights automations - template: - src: lights.yaml.j2 - dest: build/automations/lights.yaml diff --git a/automations/files/automations/tv-automations.yaml b/automations/tv-automations.yaml similarity index 100% rename from automations/files/automations/tv-automations.yaml rename to automations/tv-automations.yaml diff --git a/automations/files/automations/vacuum.yaml b/automations/vacuum.yaml similarity index 100% rename from automations/files/automations/vacuum.yaml rename to automations/vacuum.yaml diff --git a/automations/vars/main.yaml b/automations/vars/main.yaml deleted file mode 100644 index 7731309..0000000 --- a/automations/vars/main.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# vars file for automations -lights: - - entityId: light.bathroom_lights - name: Bathroom Lights - - entityId: light.computer_lights - name: Computer Lights - - entityId: light.kitchen_lights - name: Kitchen Lights - - entityId: light.shower_lights - name: Shower Lights - - entityId: light.tv_lights - name: TV Lights - - entityId: light.computer_computer_cave_background - name: Computer Computer Cave Background - - entityId: light.couch_lamp - name: Couch lamp diff --git a/automations/files/automations/work-daily.yaml b/automations/work-daily.yaml similarity index 100% rename from automations/files/automations/work-daily.yaml rename to automations/work-daily.yaml diff --git a/automations/files/automations/work-finished.yaml b/automations/work-finished.yaml similarity index 100% rename from automations/files/automations/work-finished.yaml rename to automations/work-finished.yaml diff --git a/automations/files/configuration.yaml b/configuration.yaml similarity index 99% rename from automations/files/configuration.yaml rename to configuration.yaml index 402314b..12a342c 100644 --- a/automations/files/configuration.yaml +++ b/configuration.yaml @@ -166,11 +166,11 @@ tplink: switch: - host: '192.168.60.14' -calendar: - - platform: caldav - url: https://cloud.grondek.pl/remote.php/dav - username: pgrondek - password: !secret nextcloud_token +#calendar: +# - platform: caldav +# url: https://cloud.grondek.pl/remote.php/dav +# username: pgrondek +# password: !secret nextcloud_token ble_monitor: # Xiaomi BT Sensors diff --git a/home-assistant.yml b/home-assistant.yml index 91e3acf..4a9b015 100644 --- a/home-assistant.yml +++ b/home-assistant.yml @@ -1,4 +1,23 @@ --- - hosts: localhost - roles: - - automations \ No newline at end of file + tasks: + - name: Build lights automations + template: + src: lights.yaml.j2 + dest: automations/lights.yaml + vars: + lights: + - entityId: light.bathroom_lights + name: Bathroom Lights + - entityId: light.computer_lights + name: Computer Lights + - entityId: light.kitchen_lights + name: Kitchen Lights + - entityId: light.shower_lights + name: Shower Lights + - entityId: light.tv_lights + name: TV Lights + - entityId: light.computer_computer_cave_background + name: Computer Computer Cave Background + - entityId: light.couch_lamp + name: Couch lamp diff --git a/automations/files/scripts/android-tv.yaml b/scripts/android-tv.yaml similarity index 100% rename from automations/files/scripts/android-tv.yaml rename to scripts/android-tv.yaml diff --git a/automations/files/scripts/modes.yaml b/scripts/modes.yaml similarity index 100% rename from automations/files/scripts/modes.yaml rename to scripts/modes.yaml diff --git a/automations/files/scripts/pause-all-media.yaml b/scripts/pause-all-media.yaml similarity index 100% rename from automations/files/scripts/pause-all-media.yaml rename to scripts/pause-all-media.yaml diff --git a/automations/templates/lights.yaml.j2 b/templates/lights.yaml.j2 similarity index 100% rename from automations/templates/lights.yaml.j2 rename to templates/lights.yaml.j2