summaryrefslogtreecommitdiffstats
path: root/lass/2configs/hass/rooms
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-05-21 08:38:16 +0200
committermakefu <github@syntax-fehler.de>2020-05-21 08:38:16 +0200
commitd027d1d5316371280221870a9c05f2b35fb437ac (patch)
treee4c8e2a580d4d7d2d01f440ec837bed707db0c64 /lass/2configs/hass/rooms
parentab0906f7aab8a49186e64c4942a516686a132558 (diff)
parentcf5b35b2df428495f5bf4dd89e3cab190f069080 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/hass/rooms')
-rw-r--r--lass/2configs/hass/rooms/bett.nix25
-rw-r--r--lass/2configs/hass/rooms/essen.nix9
-rw-r--r--lass/2configs/hass/rooms/nass.nix10
3 files changed, 22 insertions, 22 deletions
diff --git a/lass/2configs/hass/rooms/bett.nix b/lass/2configs/hass/rooms/bett.nix
index 21092ef5f..b5da9221c 100644
--- a/lass/2configs/hass/rooms/bett.nix
+++ b/lass/2configs/hass/rooms/bett.nix
@@ -1,27 +1,8 @@
{ lib, ... }:
-with import ../lib.nix;
+with import ../lib.nix { inherit lib; };
{
- lass.hass.config = lib.lists.fold lib.recursiveUpdate {} [
- {
- #automation = [{
- # trigger = {
- # platform = "mqtt";
- # topic = "zigbee/0x00178801086ac38c/action";
- # payload = "on-press";
- # };
- # action = {
- # service = "light.turn_on";
- # data = {
- # brightness = 150;
- # rgb_color = [ 255 0 0 ];
- # entity_id = [
- # "light.0x0017880108327622_light"
- # ];
- # };
- # };
- #}];
- }
- (lightswitch sensors.bett lights.bett)
+ lass.hass.config = lib.mkMerge [
+ (lightswitch switches.dimmer.bett lights.bett)
];
}
diff --git a/lass/2configs/hass/rooms/essen.nix b/lass/2configs/hass/rooms/essen.nix
new file mode 100644
index 000000000..f74996154
--- /dev/null
+++ b/lass/2configs/hass/rooms/essen.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+with import ../lib.nix { inherit lib; };
+
+{
+ lass.hass.config = lib.mkMerge [
+ (detect_movement sensors.movement.essen lights.essen 10)
+ (lightswitch switches.dimmer.essen lights.essen)
+ ];
+}
diff --git a/lass/2configs/hass/rooms/nass.nix b/lass/2configs/hass/rooms/nass.nix
new file mode 100644
index 000000000..163f4fc48
--- /dev/null
+++ b/lass/2configs/hass/rooms/nass.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+with import ../lib.nix { inherit lib; };
+
+{
+ lass.hass.config = lib.mkMerge [
+ (detect_movement sensors.movement.nass lights.nass 100)
+ (lightswitch switches.dimmer.nass lights.nass)
+ ];
+}
+