From 79fb6cc0618945369b61880fc784d6d92d2ebb43 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Tue, 14 Apr 2020 17:49:09 +0200
Subject: [PATCH] pepe: split in essential and normal trigger groups

---
 configs/pepe/home-assistant.nix             | 59 ++++++++++++++++++---
 configs/pepe/home-assistant/zigbee2mqtt.nix |  2 +-
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/configs/pepe/home-assistant.nix b/configs/pepe/home-assistant.nix
index 0c3c831..ee977a5 100644
--- a/configs/pepe/home-assistant.nix
+++ b/configs/pepe/home-assistant.nix
@@ -66,14 +66,18 @@ in {
         }
       ];
     in (presents "kitchen_room" "kitchen_room_present")
+    ++ (presents "kitchen_room_essential" "kitchen_room_essential_present")
     ++ (presents "living_room" "living_room_present")
+    ++ (presents "living_essential_room" "living_room_essential_present")
     ++ (presents "floor_room" "floor_room_present")
-    ++ (presents "bed_room" "bed_room_present") ++ [
+    ++ (presents "floor_room_essential" "floor_room_essential_present")
+    ++ (presents "bed_room" "bed_room_present")
+    ++ (presents "bed_room_essential" "bed_room_essential_present") ++ [
 
     ];
 
     group = let
-      create_room = { name, description, presentEntities ? [ ] }: {
+      create_room = { name, description }: {
         "${name}" = {
           name = description;
           view = false;
@@ -83,12 +87,19 @@ in {
           control = "hidden";
           name = "${description} Anwesend";
           view = false;
-          entities = presentEntities;
+          entities = [];
         };
         "${name}_essential" = {
           control = "hidden";
           name = "${description} Minimale Beleuchtung";
           view = false;
+          entities = [ ];
+        };
+        "${name}_essential_present" = {
+          control = "hidden";
+          name = "${description} Flüchtig Anwesend";
+          view = false;
+          entities = [ "group.${name}_present" ];
         };
       };
       create_rooms = rooms:
@@ -119,13 +130,45 @@ in {
         entities = [
           "group.all_lights"
           "group.floor_room"
-          "group.floor_room_present"
+          "group.floor_room_essential_present"
           "group.bed_room"
-          "group.bed_room_present"
+          "group.bed_room_essential_present"
           "group.living_room"
-          "group.living_room_present"
+          "group.living_room_essential_present"
           "group.kitchen_room"
-          "group.kitchen_room_present"
+          "group.kitchen_room_essential_present"
+        ];
+      };
+      view_bed_room = {
+        name = "Schlafzimmer";
+        view = true;
+        entities = [
+          "group.bed_room"
+          "group.bed_room_essential_present"
+        ];
+      };
+      view_living_room = {
+        name = "Wohnzimmer";
+        view = true;
+        entities = [
+          "group.living_room"
+          "group.living_room_essential_present"
+        ];
+      };
+      view_kitchen_room = {
+        name = "Küche";
+        view = true;
+        entities = [
+          "group.kitchen_room"
+          "group.kitchen_room_essential_present"
+        ];
+      };
+      view_floor_room = {
+        name = "Flur";
+        view = true;
+        entities = [
+          "group.floor_room"
+          "group.floor_room_essential_present"
         ];
       };
 
@@ -143,7 +186,7 @@ in {
       view_overview = {
         name = "Übersicht";
         view = true;
-        entities = [ "group.today" "group.all_sensors" ];
+        entities = [ "group.today" ];
       };
 
       # other stuff
diff --git a/configs/pepe/home-assistant/zigbee2mqtt.nix b/configs/pepe/home-assistant/zigbee2mqtt.nix
index 2930921..116bec0 100644
--- a/configs/pepe/home-assistant/zigbee2mqtt.nix
+++ b/configs/pepe/home-assistant/zigbee2mqtt.nix
@@ -64,7 +64,7 @@ let
       };
       "motion_sensor_7" = {
         id = "0x00158d0002f9a6aa";
-        room = "bed_room_present";
+        room = "bed_room_essential_present";
       };
       "motion_sensor_8" = { id = "0x00158d0002f04637"; };
     };