Merge branch 'master' of ssh://git.ingolf-wagner.de:443/palo/nixos-config

This commit is contained in:
Ingolf Wagner 2020-05-02 00:47:02 +02:00
commit 3608d2a0d9
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 3 additions and 11 deletions

View file

@ -116,6 +116,7 @@ in {
entity_id = "group.${presentsGroup}"; entity_id = "group.${presentsGroup}";
from = "on"; from = "on";
to = "off"; to = "off";
for.seconds = 2 * 60;
}; };
condition = { condition = {
condition = "and"; condition = "and";

View file

@ -8,9 +8,8 @@ let
groups = [ "all_lights" "bed_room_lights" "bed_room" ]; groups = [ "all_lights" "bed_room_lights" "bed_room" ];
}; };
"pal02" = { "pal02" = {
label = "Wohnzimmer Lampe"; label = "Nummer 2";
icon = "mdi:lightbulb"; icon = "mdi:lightbulb";
groups = [ ];
}; };
"pal03" = { "pal03" = {
label = "Wohnzimmer Lampe"; label = "Wohnzimmer Lampe";

View file

@ -7,49 +7,41 @@ let
"motion_sensor_1" = { "motion_sensor_1" = {
id = "0x00158d0002fbd451"; id = "0x00158d0002fbd451";
groups = [ "kitchen_room" "kitchen_room_present" ]; groups = [ "kitchen_room" "kitchen_room_present" ];
timeout = 60 * 2;
}; };
"motion_sensor_2" = { "motion_sensor_2" = {
id = "0x00158d0002f9a6b8"; id = "0x00158d0002f9a6b8";
groups = [ "kitchen_room" "kitchen_room_present" ]; groups = [ "kitchen_room" "kitchen_room_present" ];
timeout = 60 * 2;
}; };
"motion_sensor_3" = { "motion_sensor_3" = {
id = "0x00158d0002f04522"; id = "0x00158d0002f04522";
groups = [ "living_room" "living_room_present" ]; groups = [ "living_room" "living_room_present" ];
timeout = 60 * 3;
}; };
"motion_sensor_4" = { "motion_sensor_4" = {
id = "0x00158d0002f9a558"; id = "0x00158d0002f9a558";
groups = [ "living_room" "living_room_present" ]; groups = [ "living_room" "living_room_present" ];
timeout = 60 * 3;
}; };
"motion_sensor_5" = { "motion_sensor_5" = {
id = "0x00158d0002f9a56f"; id = "0x00158d0002f9a56f";
groups = [ "bath_room" "bath_room_present" ]; groups = [ "bath_room" "bath_room_present" ];
timeout = 60 * 3;
}; };
"motion_sensor_6" = { "motion_sensor_6" = {
id = "0x00158d0002f9a5cb"; id = "0x00158d0002f9a5cb";
groups = [ "floor_room" "floor_room_present" ]; groups = [ "floor_room" "floor_room_present" ];
timeout = 60 * 2;
}; };
"motion_sensor_7" = { "motion_sensor_7" = {
id = "0x00158d0002f9a6aa"; id = "0x00158d0002f9a6aa";
groups = [ "bed_room" "bed_room_present" ]; groups = [ "bed_room" "bed_room_present" ];
timeout = 60 * 1.2;
}; };
"motion_sensor_8" = { "motion_sensor_8" = {
id = "0x00158d0002f04637"; id = "0x00158d0002f04637";
groups = [ "bath_room" "bath_room_present" ]; groups = [ "bath_room" "bath_room_present" ];
timeout = 60 * 3;
}; };
}; };
in { in {
services.zigbee2mqtt.devices = lib.mapAttrs' (name: services.zigbee2mqtt.devices = lib.mapAttrs' (name:
{ id, timeout ? 90, ... }: { { id, timeout ? 65, ... }: {
name = id; name = id;
value = { value = {
retain = false; retain = false;