From 1d6fbac45c5306f02dde1ed2d659854331db64e4 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Thu, 14 Jun 2018 16:38:20 -0400
Subject: [PATCH] Create groups and views in each package

---
 groups.yaml             | 21 ++-------------------
 packages/darksky.yaml   | 23 +++++++++++++++++++++++
 packages/occupancy.yaml | 23 ++++++++++++++++++++++-
 packages/plex.yaml      | 18 ++++++++++++++++++
 packages/sonos.yaml     | 16 ++++++++++++++++
 packages/sunrise.yaml   | 25 +++++++++++++++++++++++++
 6 files changed, 106 insertions(+), 20 deletions(-)

diff --git a/groups.yaml b/groups.yaml
index 55cbbea..74729b9 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -20,19 +20,12 @@ Entertainment:
   view: yes
   name: Entertainment
   entities:
-    - group.plex
-    - group.sonos
+    - group.plex_players
+    - group.sonos_players
     - group.chromecast
     - group.consoles
     - binary_sensor.den_night_mode
 
-Automation:
-  view: yes
-  name: Automation
-  entities:
-    - group.all_scripts
-    - group.all_automations
-
 livingroom_lights:
   name: Living Room
   entities:
@@ -60,16 +53,6 @@ consoles:
     - device_tracker.PS4
     - device_tracker.WiiU
 
-plex:
-  name: Plex
-  entities:
-    - media_player.plex_ps4
-
-sonos:
-  name: Sonos
-  entities:
-    - media_player.den
-
 chromecast:
   name: Chromecast
   entities:
diff --git a/packages/darksky.yaml b/packages/darksky.yaml
index 4071bc9..2943837 100644
--- a/packages/darksky.yaml
+++ b/packages/darksky.yaml
@@ -59,3 +59,26 @@ script:
                  
                ] | random }}
   
+group:
+  DarkSky:
+    view: yes
+    icon: mdi:weather-rainy
+    entities:
+      - group.darksky_sensors
+      - group.darksky_automations
+      - group.darksky_scripts
+  darksky_sensors:
+    name: Sensors
+    entities:
+      - sensor.dark_sky_summary
+      - sensor.dark_sky_hourly_summary
+      - sensor.dark_sky_daily_summary
+      - sensor.dark_sky_temperature
+  darksky_automations:
+    name: Automations
+    entities:
+      - automation.morning_weather
+  darksky_scripts:
+    name: Scripts
+    entities:
+      - script.weather_report
diff --git a/packages/occupancy.yaml b/packages/occupancy.yaml
index 8332815..2de7ba0 100644
--- a/packages/occupancy.yaml
+++ b/packages/occupancy.yaml
@@ -1,5 +1,5 @@
 automation:
-  - alias: Turn off lights when everyone leaves
+  - alias: Turn off lights when unoccupied
     action:
       - service: light.turn_off
         data:
@@ -68,3 +68,24 @@ binary_sensor:
           {{ is_state('group.all_lights', 'on')
              or is_state('media_player.den', 'playing')
           }}
+
+group:
+  Occupancy:
+    view: yes
+    icon: mdi:account-group
+    entities:
+      - binary_sensor.occupied
+      - binary_sensor.activity
+      - group.phones
+      - group.occupancy_automations
+      - group.occupancy_overrides
+  occupancy_automations:
+    name: Automations
+    entities:
+      - automation.turn_off_lights_when_unoccupied
+      - automation.set_occupied
+      - automation.unset_occupied
+  occupancy_overrides:
+    name: Overrides
+    entities:
+      - input_boolean.occupied
diff --git a/packages/plex.yaml b/packages/plex.yaml
index 5419d5c..88116fe 100644
--- a/packages/plex.yaml
+++ b/packages/plex.yaml
@@ -44,3 +44,21 @@ automation:
       - condition: state
         entity_id: sun.sun
         state: 'above_horizon'
+
+group:
+  Plex:
+    view: yes
+    icon: mdi:television
+    entities:
+      - group.plex_players
+      - group.plex_automations
+  plex_players:
+    name: Plex
+    entities:
+      - media_player.plex_ps4
+  plex_automations:
+    name: Automations
+    entities:
+      - automation.dim_when_plex_is_active
+      - automation.restore_nighttime_lights_after_plex
+      - automation.restore_normal_lights_after_plex
diff --git a/packages/sonos.yaml b/packages/sonos.yaml
index 012476f..5f4daaa 100644
--- a/packages/sonos.yaml
+++ b/packages/sonos.yaml
@@ -19,3 +19,19 @@ binary_sensor:
         value_template: >-
           {{ state_attr('media_player.den', 'night_sound') }}
 
+group:
+  Sonos:
+    view: yes
+    icon: mdi:speaker
+    entities:
+      - binary_sensor.den_night_mode
+      - group.sonos_players
+      - group.sonos_automations
+  sonos_players:
+    name: Sonos
+    entities:
+      - media_player.den
+  sonos_automations:
+    name: Automations
+    entities:
+      - automation.toggle_sonos_night_mode
diff --git a/packages/sunrise.yaml b/packages/sunrise.yaml
index 2efa534..a2fe7ce 100644
--- a/packages/sunrise.yaml
+++ b/packages/sunrise.yaml
@@ -71,3 +71,28 @@ automation:
           - wed
           - thu
           - fri
+
+group:
+  Sunrise:
+    view: yes
+    icon: mdi:weather-sunset
+    entities:
+      - sun.sun
+      - group.sunrise_scenes
+      - group.sunrise_automations
+      - group.sunrise_scripts
+  sunrise_scenes:
+    name: scenes
+    entities:
+      - scene.dawn_sun
+      - scene.dawn_daylight
+      - scene.sunrise_sun
+      - scene.sunrise_daylight
+  sunrise_automations:
+    name: Automations
+    entities:
+      - automation.sunrise
+  sunrise_scripts:
+    name: Scripts
+    entities:
+      - script.sunrise