diff --git a/.HA_VERSION b/.HA_VERSION
index 08de1c6af805c621ee1f9237bc211894f0cda131..5f8dbbf5058c2690fa89fe89e18d61ada6d25321 100644
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.88.1
\ No newline at end of file
+0.92.2
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 031a39fe656d4fa1463ea3aa492b601588353f05..7b0fa071a6512cff36cac09bd5ca81dfabbbacf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
deps
*.db
+.cloud/
.storage/
+.august.conf
diff --git a/august.yaml b/august.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..51f92b972ff09dc130fe67f4ad833c8a2bc4a004
--- /dev/null
+++ b/august.yaml
@@ -0,0 +1,3 @@
+login_method: email
+username: !secret august_user
+password: !secret august_pass
diff --git a/automations/office-lights-timeout.yaml b/automations/office-lights-timeout.yaml
index ab527714f26e2e9a7c20c07020365f6e2fc24a5d..5b0ae698a57c435a57e25889c687315ff859c513 100644
--- a/automations/office-lights-timeout.yaml
+++ b/automations/office-lights-timeout.yaml
@@ -10,7 +10,7 @@ condition:
entity_id: light.office
state: 'on'
- condition: state
- entity_id: light.ericks_desk_lamp
+ entity_id: light.erick_s_desk_lamp
state: 'on'
- condition: state
entity_id: switch.lava_lamp
diff --git a/cloud.yaml b/cloud.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..67072dc124049a172c42b32499c1efd56e2c1970
--- /dev/null
+++ b/cloud.yaml
@@ -0,0 +1,27 @@
+google_actions:
+ filter:
+ include_domains:
+ - switch
+ - light
+ include_entities:
+ - group.ceiling_fan
+ - group.master_bathroom
+ exclude_entities:
+ - lock.interior_bolt
+ - lock.keyed_bolt
+ - group.locks
+ - switch.alarm_status
+ - switch.christmas_tree
+ - switch.balcony_outlet
+ - light.ceiling_fan_1
+ - light.ceiling_fan_2
+ - light.master_bath_1
+ - light.master_bath_2
+ - light.master_bath_3
+ entity_config:
+ light.office:
+ name: Floor Lamp
+ light.erick_s_desk_lamp:
+ name: Desk Lamp
+ switch.kitchen:
+ name: Kitchen Light
diff --git a/configuration.yaml b/configuration.yaml
index 78d4a04a9d24edd931638a8ba2534010269a5971..b07cd20b560f165d2632a021fc2cd91256f39ec4 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -13,20 +13,18 @@ homeassistant:
auth_providers:
- type: homeassistant
- type: legacy_api_password
- - type: trusted_networks
+ api_password: !secret api_password
auth:
+config:
+
http:
- api_password: !secret api_password
server_port: 8123
ssl_certificate: /home/pi/ssl/chain
ssl_key: /home/pi/ssl/key
- trusted_networks:
- # - 127.0.0.1
- # - ::1
- - 192.168.1.0/24
- - 2605:e000:1417:40e2::/64
+
+cloud: !include cloud.yaml
zone:
name: Home
@@ -100,7 +98,9 @@ panel_iframe: !include panels-iframe.yaml
apcupsd:
-google_assistant: !include google-assistant.yaml
+august: !include august.yaml
+
+system_health:
# Display
group: !include groups.yaml
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index f0cf059946f89beddb882684f47e916511e252a2..a9d6473df8a8f6a4341b62d8e74e0fbcb059c8ae 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,6 +1,6 @@
light.office:
friendly_name: Office Lamp
-light.ericks_desk_lamp:
+light.erick_s_desk_lamp:
icon: mdi:lightbulb-outline
light.ceiling_fan_1:
friendly_name: Ceiling Fan Front
diff --git a/google-assistant.yaml b/google-assistant.yaml
deleted file mode 100644
index 4e730719922c37b57257b2a94b0f3276257d8afb..0000000000000000000000000000000000000000
--- a/google-assistant.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-project_id: !secret google_home_project_id
-api_key: !secret google_home_api_key
-exposed_domains:
- - switch
- - light
-entity_config:
- group.locks:
- expose: false
- switch.august_interior:
- expose: false
- switch.august_keyed:
- expose: false
- switch.alarm_status:
- expose: false
- switch.christmas_tree:
- expose: false
- switch.balcony_outlet:
- expose: false
- light.office:
- name: Floor Lamp
- light.ericks_desk_lamp:
- name: Desk Lamp
- switch.kitchen:
- name: Kitchen Light
- group.ceiling_fan:
- expose: true
- light.ceiling_fan_1:
- expose: false
- light.ceiling_fan_2:
- expose: false
- group.master_bathroom:
- expose: true
- light.master_bath_1:
- expose: false
- light.master_bath_2:
- expose: false
- light.master_bath_3:
- expose: false
diff --git a/groups.yaml b/groups.yaml
index ad2bc2c1e11403827d45810c01b711e84ce3a040..fcf7acbd66b3b29a8d1368d9ada863120b3b488b 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -3,6 +3,7 @@ default_view:
view: yes
icon: mdi:home
entities:
+ - group.locks
- group.master_bedroom
- group.master_bathroom
- group.living_room
@@ -10,7 +11,6 @@ default_view:
- group.office
- group.balcony
- group.other
- - alarm_control_panel.shm
sensor_view:
name: Sensors
view: yes
@@ -36,12 +36,21 @@ media_view:
view: yes
icon: mdi:play-network
entities:
+ - media_player.apartment
+ - media_player.common_area
+ - media_player.everywhere
+ - media_player.office
- media_player.living_room
+ - media_player.kitchen
+ - media_player.nexus_player
+ - media_player.bedroom_speaker
+ - media_player.chromecastultra9699
misc_view:
name: Misc
view: yes
icon: mdi:power
entities:
+ - alarm_control_panel.shm
- group.misc_misc
- group.haveibeenpwned
- group.sensor_battery_levels
@@ -82,7 +91,7 @@ office:
name: Office
entities:
- light.office
- - light.ericks_desk_lamp
+ - light.erick_s_desk_lamp
- switch.lava_lamp
- input_select.scene_office
- input_select.scene_ericks_desk_lamp
@@ -216,3 +225,8 @@ sensor_battery_levels:
- sensor.office_motion_sensor_far_wall_battery_level
- sensor.office_cabinet_battery_level
- sensor.green_keys_battery_level
+locks:
+ name: Locks
+ entities:
+ - lock.keyed_bolt
+ - lock.interior_bolt
diff --git a/known_devices.yaml b/known_devices.yaml
index 8563ff720adcc94db8b8e63ce9a514fb3429766b..7cf026f89af4e324365edd2e35f23517c8e78394 100644
--- a/known_devices.yaml
+++ b/known_devices.yaml
@@ -2,19 +2,19 @@ green_keys:
name: Green Keys
mac:
picture:
- track: yes
+ track: true
hide_if_away: no
eh_nexus_6:
name: EH Nexus 6
mac: -
gravatar: !secret gravatar_erick
- track: yes
+ track: true
hide_if_away: no
cl_samsung_s5:
name: CL Samsung S5
mac: -
gravatar: !secret gravatar_chris
- track: yes
+ track: true
hide_if_away: no
diff --git a/scenes/all-lights-off.yaml b/scenes/all-lights-off.yaml
index 9a18b528474aab3a76c53306c120260f4cd3affc..e6c1c7f71b4a09ad43a27b440fbee385a0051489 100644
--- a/scenes/all-lights-off.yaml
+++ b/scenes/all-lights-off.yaml
@@ -20,7 +20,7 @@ entities:
state: off
light.office:
state: off
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: off
switch.lava_lamp:
state: off
diff --git a/scenes/ericks-desk-lamp-blink-long.yaml b/scenes/ericks-desk-lamp-blink-long.yaml
index 287aabaa8a09a17f1464d600a307133b45c1f530..a6d01638e2c0609f7d0611e0e05a5811cab487ff 100644
--- a/scenes/ericks-desk-lamp-blink-long.yaml
+++ b/scenes/ericks-desk-lamp-blink-long.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Blink Long
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/ericks-desk-lamp-blink-short.yaml b/scenes/ericks-desk-lamp-blink-short.yaml
index 9cb878165ec79c18742a5817f90e14d9bfd38ad1..eaa88901a19f879d2ad939dcc5d66253269b7766 100644
--- a/scenes/ericks-desk-lamp-blink-short.yaml
+++ b/scenes/ericks-desk-lamp-blink-short.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Blink Short
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/ericks-desk-lamp-nightlight.yaml b/scenes/ericks-desk-lamp-nightlight.yaml
index 45fb8dc00f3d51862e79161f32a909a8a1134781..5914174867bb1d8ecb2840ca37a139a2093ad587 100644
--- a/scenes/ericks-desk-lamp-nightlight.yaml
+++ b/scenes/ericks-desk-lamp-nightlight.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Nightlight
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 1
color_temp: 450
diff --git a/scenes/ericks-desk-lamp-off.yaml b/scenes/ericks-desk-lamp-off.yaml
index 50eb45edf17db1b7ebbfa9126e6a129ee92c7699..7714e42805e8d80f425e6e9edc1a7f10196e9227 100644
--- a/scenes/ericks-desk-lamp-off.yaml
+++ b/scenes/ericks-desk-lamp-off.yaml
@@ -1,4 +1,4 @@
name: Erick's Desk Lamp Off
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: off
diff --git a/scenes/ericks-desk-lamp-relax.yaml b/scenes/ericks-desk-lamp-relax.yaml
index db22cb3cfa5b0d49f0b001a40f63b9724db654b4..84677649b107bb1aedb04adf5cca0113afc7baa5 100644
--- a/scenes/ericks-desk-lamp-relax.yaml
+++ b/scenes/ericks-desk-lamp-relax.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Relax
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/office-desk-nightlight.yaml b/scenes/office-desk-nightlight.yaml
index a843a10c3efb54d24dad30dc93b5cca041136871..b9ce202b2a7ef3db558fa5aea2af713fc0d4967a 100644
--- a/scenes/office-desk-nightlight.yaml
+++ b/scenes/office-desk-nightlight.yaml
@@ -4,7 +4,7 @@ entities:
state: on
brightness: 1
color_temp: 450
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 1
color_temp: 450
diff --git a/scripts.yaml b/scripts.yaml
index ebc901378c83358e500b73affc4798a6ef2cbf26..c1c788427be3f2d1cc66749476a48a272591d69e 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -45,7 +45,7 @@ office_lights_timeout:
data:
entity_id:
- light.office
- - light.ericks_desk_lamp
+ - light.erick_s_desk_lamp
- service: switch.turn_off
data:
entity_id: switch.lava_lamp
@@ -97,34 +97,6 @@ dining_area_lights_timeout:
entity_id:
- light.ceiling_fan_1
- light.ceiling_fan_2
-# Restart August Lock daemon
-restart_august_daemon:
- sequence:
- - service: shell_command.restart_august_daemon
-# Force lock keyed
-force_lock_keyed:
- sequence:
- - service: shell_command.force_lock_keyed
-# Force unlock keyed
-force_unlock_keyed:
- sequence:
- - service: shell_command.force_unlock_keyed
-# Force disconnect keyed
-force_disconnect_keyed:
- sequence:
- - service: shell_command.force_disconnect_keyed
-# Force lock interior
-force_lock_interior:
- sequence:
- - service: shell_command.force_lock_interior
-# Force unlock interior
-force_unlock_interior:
- sequence:
- - service: shell_command.force_unlock_interior
-# Force disconnect interior
-force_disconnect_interior:
- sequence:
- - service: shell_command.force_disconnect_interior
# Kitchen light timeout
kitchen_light_set_timeout:
diff --git a/secrets.yaml b/secrets.yaml
index 1db37fc32db82e8cf6f0c89bf97ef5e8c11f52ec..0b98c127421ffa42c53e0087f68e06687a4f7e54 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -15,5 +15,5 @@ pi_hole_backup_host: 127.0.0.1
pi_hole_admin: 127.0.0.1
monit_admin: 'https://127.0.0.1:2812/'
mattermost_webhook: http://127.0.0.1
-google_home_project_id: 1
-google_home_api_key: abcdef0123456789
+august_user: something@example.com
+august_pass: password