Sync with upstream

96a334d

.HA_VERSION

-0.88.1
+0.92.2
\ No newline at end of file

.gitignore

 deps
 *.db
+.cloud/
 .storage/
+.august.conf

august.yaml

+login_method: email
+username: !secret august_user
+password: !secret august_pass

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

cloud.yaml

+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

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

customizations/lights.yaml

 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

google-assistant.yaml

-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

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

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

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

scenes/ericks-desk-lamp-blink-long.yaml

 name: Erick's Desk Lamp Blink Long
 entities:
-  light.ericks_desk_lamp:
+  light.erick_s_desk_lamp:
     state: on
     brightness: 144
     color_temp: 443

scenes/ericks-desk-lamp-blink-short.yaml

 name: Erick's Desk Lamp Blink Short
 entities:
-  light.ericks_desk_lamp:
+  light.erick_s_desk_lamp:
     state: on
     brightness: 144
     color_temp: 443

scenes/ericks-desk-lamp-nightlight.yaml

 name: Erick's Desk Lamp Nightlight
 entities:
-  light.ericks_desk_lamp:
+  light.erick_s_desk_lamp:
     state: on
     brightness: 1
     color_temp: 450

scenes/ericks-desk-lamp-off.yaml

 name: Erick's Desk Lamp Off
 entities:
-  light.ericks_desk_lamp:
+  light.erick_s_desk_lamp:
     state: off

scenes/ericks-desk-lamp-relax.yaml

 name: Erick's Desk Lamp Relax
 entities:
-  light.ericks_desk_lamp:
+  light.erick_s_desk_lamp:
     state: on
     brightness: 144
     color_temp: 443

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

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:

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