summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-03-03 21:19:19 +0100
committermakefu <github@syntax-fehler.de>2020-03-03 21:19:19 +0100
commit0f93e2d02aa7bd63771a3ad41b0b0ffffbc0c564 (patch)
tree212aa8af809046a2c2e06363570793938109b585 /makefu/2configs
parente1d6406fbd7be66bd4a2ebd08c568a19ee09f906 (diff)
ma ham: cleanup
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/ham/lib/default.nix1
-rw-r--r--makefu/2configs/ham/multi/timer.nix123
-rw-r--r--makefu/2configs/ham/multi/zigbee2mqtt.nix38
-rw-r--r--makefu/2configs/ham/sensor/outside.nix6
4 files changed, 2 insertions, 166 deletions
diff --git a/makefu/2configs/ham/lib/default.nix b/makefu/2configs/ham/lib/default.nix
index c2d7916c1..45c86138b 100644
--- a/makefu/2configs/ham/lib/default.nix
+++ b/makefu/2configs/ham/lib/default.nix
@@ -40,4 +40,5 @@ in
entity = "firetv";
};
};
+ zigbee.prefix = "/ham/zigbee";
}
diff --git a/makefu/2configs/ham/multi/timer.nix b/makefu/2configs/ham/multi/timer.nix
deleted file mode 100644
index eafb7841d..000000000
--- a/makefu/2configs/ham/multi/timer.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-# Provides:
-# timer
-# automation
-# script
-
-# Needs:
-# sensor.zigbee_btn1_click
-# notify.telegrambot
-let
- button = "sensor.zigbee_btn1_click";
-in {
- timer.kurzzeitwecker =
- {
- name = "Zigbee Kurzzeitwecker";
- duration = 300;
- };
- script.add_5_minutes_to_kurzzeitwecker =
- {
- alias = "Add 5 minutes to kurzzeitwecker";
- sequence = [
- { service = "timer.pause";
- entity_id = "timer.kurzzeitwecker";
- }
- { service = "timer.start";
- data_template = {
- entity_id = "timer.kurzzeitwecker";
- duration = ''
- {% set r = state_attr('timer.wecker', 'remaining') ~ '-0000' %}
- {% set t = strptime(r, '%H:%M:%S.%f%z') %}
- {{ (as_timestamp(t) + 300) | timestamp_custom('%H:%M:%S', false) }}
- '';
- };
- }
- ];
- };
- automation =
- [
- {
- alias = "Start Timer 5min";
- trigger = {
- platform = "state";
- entity_id = button;
- to = "single";
- };
- condition =
- { condition = "state";
- entity_id = "timer.kurzzeitwecker";
- state = "idle";
- };
-
- action = [
- { service = "timer.start";
- entity_id = "timer.kurzzeitwecker";
- duration = "00:05:00";
- }
- {
- service = "notify.telegrambot";
- data = {
- title = "Timer gestartet";
- message = "Timer auf 5 minuten gestellt";
- };
- }
- ];
- }
- {
- alias = "Start Timer 10min";
- trigger = {
- platform = "state";
- entity_id = button;
- to = "double";
- };
- condition =
- {
- condition = "state";
- entity_id = "timer.kurzzeitwecker";
- state = "idle";
- };
- action =
- [
- {
- service = "timer.start";
- entity_id = "timer.kurzzeitwecker";
- duration = "00:10:00";
- }
- {
- service = "notify.telegrambot";
- data = {
- title = "Timer gestartet";
- message = "Timer auf 10 minuten gestellt";
- };
- }
- ];
- }
- {
- alias = "Stop timer on triple click";
- trigger =
- {
- platform = "state";
- entity_id = button;
- to = "triple";
- };
- condition =
- {
- condition = "state";
- entity_id = "timer.kurzzeitwecker";
- state = "active";
- };
-
- action = [
- {
- service = "timer.stop";
- entity_id = "timer.kurzzeitwecker";
- }
- {
- service = "notify.telegrambot";
- data = {
- title = "Timer gestoppt";
- };
- }
- ];
- }
- ];
-}
diff --git a/makefu/2configs/ham/multi/zigbee2mqtt.nix b/makefu/2configs/ham/multi/zigbee2mqtt.nix
index ba81b1298..947eb5517 100644
--- a/makefu/2configs/ham/multi/zigbee2mqtt.nix
+++ b/makefu/2configs/ham/multi/zigbee2mqtt.nix
@@ -8,43 +8,10 @@
let
inherit (import ../lib) zigbee;
prefix = zigbee.prefix;
- xiaomi_btn = name: [
- (zigbee.battery name)
- (zigbee.linkquality name)
- (zigbee.click name)
- ];
- xiaomi_temp = name: [
- (zigbee.battery name)
- (zigbee.linkquality name)
- (zigbee.temperature name)
- (zigbee.humidity name)
- (zigbee.pressure name)
- ];
- xiaomi_contact = name: [
- (zigbee.battery name)
- (zigbee.linkquality name)
- (zigbee.contact name)
- ];
- router_link = name: [
- (zigbee.linkquality name)
- ];
- router_bin = name: [
- (zigbee.state name)
- ];
in {
sensor =
- (xiaomi_btn "btn1")
- ++ (xiaomi_btn "btn2")
- ++ (xiaomi_btn "btn3")
-
- ++ (xiaomi_temp "temp1")
- ++ (xiaomi_temp "temp2")
- ++ (xiaomi_temp "temp3")
-
- ++ (router_link "router1")
- ++ (router_link "router2")
- ++ [
+ [
# Sensor for monitoring the bridge state
{
platform = "mqtt";
@@ -69,9 +36,6 @@ in {
icon = "mdi:chip";
}
];
- binary_sensor =
- (router_bin "router1")
- ++ (router_bin "router2");
switch = [
{
platform = "mqtt";
diff --git a/makefu/2configs/ham/sensor/outside.nix b/makefu/2configs/ham/sensor/outside.nix
index 8436b8de2..c46b35ba3 100644
--- a/makefu/2configs/ham/sensor/outside.nix
+++ b/makefu/2configs/ham/sensor/outside.nix
@@ -17,10 +17,4 @@
units = "si" ;
scan_interval = "00:30:00";
}
- { platform = "luftdaten";
- name = "Muehlhausen";
- show_on_map = true;
- sensor_id = "679";
- sensors.monitored_conditions = [ "P1" "P2" ];
- }
]