ma home/ham: add signal-rest, update automations
This commit is contained in:
parent
7f515fd150
commit
485807c22d
@ -1,3 +1,8 @@
|
|||||||
|
{ lib, ... }:
|
||||||
|
#uses:
|
||||||
|
# notify.signal
|
||||||
|
# binary_sensor.badezimmer_fenster_contact
|
||||||
|
# binary_sensor.dusche_fenster_contact
|
||||||
let
|
let
|
||||||
min = 20;
|
min = 20;
|
||||||
fenster_offen = name: entity:
|
fenster_offen = name: entity:
|
||||||
@ -13,21 +18,57 @@ let
|
|||||||
action =
|
action =
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
service = "notify.firetv_wohnzimmer";
|
service = "notify.signal_home";
|
||||||
data = {
|
data = {
|
||||||
title = "${name} seit ${toString min} Minuten offen";
|
message= "${name} seit ${toString min} Minuten offen\nBitte einmal checken ob das ok ist :)";
|
||||||
message = "Bitte einmal checken ob das ok ist :)";
|
|
||||||
data = {
|
|
||||||
interrupt = 1;
|
|
||||||
duration = 300;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
service = "input_boolean.turn_on";
|
||||||
|
target.entity_id = "input_boolean.${lib.toLower name}_lang_offen";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
fenster_geschlossen_lang = name: entity:
|
||||||
|
{ alias = "${name} wieder geschlossen";
|
||||||
|
trigger = [
|
||||||
|
{
|
||||||
|
platform = "state";
|
||||||
|
entity_id = entity;
|
||||||
|
to = "off";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
condition = [
|
||||||
|
{ condition = "state";
|
||||||
|
entity_id = "input_boolean.${lib.toLower name}_lang_offen";
|
||||||
|
state = "on";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
action =
|
||||||
|
[
|
||||||
|
{
|
||||||
|
service = "notify.signal_home";
|
||||||
|
data = {
|
||||||
|
message= "${name} ist wieder geschlossen, Danke!";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
service = "input_boolean.turn_off";
|
||||||
|
target.entity_id = "input_boolean.${lib.toLower name}_lang_offen";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
services.home-assistant.config.automation = [
|
services.home-assistant.config = {
|
||||||
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
input_boolean = {
|
||||||
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
|
badezimmerfinester_lang_offen.name = "Badezimmer lange offen";
|
||||||
];
|
duschfenster_lang_offen.name = "Duschfenster lange offen";
|
||||||
|
};
|
||||||
|
automation = [
|
||||||
|
(fenster_geschlossen_lang "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
||||||
|
(fenster_geschlossen_lang "Duschfenster" "binary_sensor.badezimmer_fenster_contact")
|
||||||
|
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
||||||
|
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,9 @@ let
|
|||||||
name = "chilicam";
|
name = "chilicam";
|
||||||
camera = "camera.espcam_02";
|
camera = "camera.espcam_02";
|
||||||
light = "light.espcam_02_light";
|
light = "light.espcam_02_light";
|
||||||
seconds = 60; # default shutoff to protect the LED from burning out
|
seconds = 90; # default shutoff to protect the LED from burning out
|
||||||
};
|
};
|
||||||
seconds = 60;
|
seconds = 70; # time for giesskanne
|
||||||
pump = "switch.arbeitszimmer_giesskanne_relay";
|
pump = "switch.arbeitszimmer_giesskanne_relay";
|
||||||
# sensor = "sensor.statistics_for_sensor_crafting_brotbox_soil_moisture";
|
# sensor = "sensor.statistics_for_sensor_crafting_brotbox_soil_moisture";
|
||||||
in
|
in
|
||||||
|
135
makefu/2configs/home/ham/automation/lichter_dimmen.nix
Normal file
135
makefu/2configs/home/ham/automation/lichter_dimmen.nix
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
# This module maps the RF433 Remote Control to zigbee and wifi lights
|
||||||
|
let
|
||||||
|
rf_turn_off = code: light:
|
||||||
|
{
|
||||||
|
alias = "Turn off ${light} via rf code ${code}";
|
||||||
|
trigger = {
|
||||||
|
platform = "event";
|
||||||
|
event_type = "esphome.rf_code_received";
|
||||||
|
event_data.code = code;
|
||||||
|
};
|
||||||
|
action = {
|
||||||
|
service = "light.turn_off";
|
||||||
|
data.entity_id = light;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
rf_turn_on = code: light:
|
||||||
|
{
|
||||||
|
alias = "Turn on ${light} via rf code ${code}";
|
||||||
|
trigger = {
|
||||||
|
platform = "event";
|
||||||
|
event_type = "esphome.rf_code_received";
|
||||||
|
event_data.code = code;
|
||||||
|
};
|
||||||
|
action = {
|
||||||
|
service = "light.turn_on";
|
||||||
|
data.entity_id = light;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
rf_state = code: light: halfbright:
|
||||||
|
let
|
||||||
|
maxbright = 255;
|
||||||
|
transition = 0.2; # seconds
|
||||||
|
in
|
||||||
|
# this function implements a simple state machine based on the state and brightness of the light (light must support brightness
|
||||||
|
{
|
||||||
|
alias = "Cycle through states of ${light} via rf code ${code}";
|
||||||
|
trigger = {
|
||||||
|
platform = "event";
|
||||||
|
event_type = "esphome.rf_code_received";
|
||||||
|
event_data.code = code;
|
||||||
|
};
|
||||||
|
action = {
|
||||||
|
choose = [
|
||||||
|
{
|
||||||
|
# state 0: off to half
|
||||||
|
conditions = {
|
||||||
|
condition = "template";
|
||||||
|
value_template = ''{{ states("${light}") == "off" }}'';
|
||||||
|
};
|
||||||
|
sequence = [
|
||||||
|
{
|
||||||
|
service = "light.turn_on";
|
||||||
|
data = {
|
||||||
|
entity_id = light;
|
||||||
|
brightness = halfbright;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
# state 1: half to full
|
||||||
|
conditions = {
|
||||||
|
condition = "template";
|
||||||
|
value_template = ''{{ states('${light}') == 'on' and ( ${toString (halfbright - 1)} <= state_attr("${light}","brightness") <= ${toString (halfbright + 1)})}}'';
|
||||||
|
};
|
||||||
|
sequence = [
|
||||||
|
{
|
||||||
|
service = "light.turn_on";
|
||||||
|
data = {
|
||||||
|
entity_id = light;
|
||||||
|
brightness = maxbright;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
# state 2: full to off
|
||||||
|
conditions = {
|
||||||
|
condition = "template";
|
||||||
|
# TODO: it seems like the devices respond with brightness-1 , maybe off-by-one somewhere?
|
||||||
|
value_template = ''{{ states("${light}") == "on" and state_attr("${light}","brightness") >= ${toString (maxbright - 1)}}}'';
|
||||||
|
};
|
||||||
|
sequence = [
|
||||||
|
{
|
||||||
|
service = "light.turn_off";
|
||||||
|
data = {
|
||||||
|
entity_id = light;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
# default: on to off
|
||||||
|
# this works because state 0 checks for "state == off"
|
||||||
|
default = [{
|
||||||
|
service = "light.turn_off";
|
||||||
|
data = {
|
||||||
|
entity_id = light;
|
||||||
|
};
|
||||||
|
}];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
;
|
||||||
|
rf_toggle = code: light:
|
||||||
|
{
|
||||||
|
alias = "Toggle ${light} via rf code ${code}";
|
||||||
|
trigger = {
|
||||||
|
platform = "event";
|
||||||
|
event_type = "esphome.rf_code_received";
|
||||||
|
event_data.code = code;
|
||||||
|
};
|
||||||
|
action = {
|
||||||
|
service = "light.toggle";
|
||||||
|
data.entity_id = light;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.home-assistant.config.automation = [
|
||||||
|
(rf_toggle "400551" "light.wohnzimmer_fernseher_led_strip") # A
|
||||||
|
(rf_state "401151" "light.wohnzimmer_stehlampe_osram" 128) # B
|
||||||
|
(rf_state "401451" "light.wohnzimmer_komode_osram" 128) # C
|
||||||
|
(rf_state "401511" "light.wohnzimmer_schrank_osram" 128) # D
|
||||||
|
|
||||||
|
# OFF Lane
|
||||||
|
(rf_turn_off "400554" "all") # A
|
||||||
|
(rf_toggle "401154" "light.wohnzimmer_fenster_lichterkette_licht") # B
|
||||||
|
(rf_toggle "401454" "light.wohnzimmer_fernsehwand_led") # C
|
||||||
|
# (rf_toggle "401514" "") # D
|
||||||
|
];
|
||||||
|
# "400554" # A OFF
|
||||||
|
# "401154" # B OFF
|
||||||
|
# "401454" # C OFF
|
||||||
|
# "401514" # D OFF
|
||||||
|
}
|
@ -0,0 +1,39 @@
|
|||||||
|
let
|
||||||
|
notify_felix = message: {
|
||||||
|
service = "notify.signal_felix";
|
||||||
|
data.message = message;
|
||||||
|
};
|
||||||
|
notify_home = message: {
|
||||||
|
service = "notify.signal_home";
|
||||||
|
data.message = message;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.home-assistant.config.automation =
|
||||||
|
[
|
||||||
|
{
|
||||||
|
alias = "Pflanzen Giessen Erinnerung Daily";
|
||||||
|
trigger = {
|
||||||
|
platform = "time";
|
||||||
|
at = "12:15:00";
|
||||||
|
};
|
||||||
|
action = [
|
||||||
|
(notify_felix "Es ist Mittagszeit und du kannst ruhig einmal alle Blumen im Zimmer giessen")
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
alias = "Pflanzen Giessen Erinnerung Weekly";
|
||||||
|
trigger = {
|
||||||
|
platform = "time";
|
||||||
|
at = "12:15:00";
|
||||||
|
};
|
||||||
|
condition = {
|
||||||
|
condition = "time";
|
||||||
|
weekday = [ "sat" ];
|
||||||
|
};
|
||||||
|
action = [
|
||||||
|
(notify_home "Es ist Wochenende und die Pflanzen würden sich über ein bisschen Wasser freuen.")
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
@ -8,6 +8,36 @@ in
|
|||||||
platform = "caldav";
|
platform = "caldav";
|
||||||
inherit (cred) username password;
|
inherit (cred) username password;
|
||||||
url = "https://o.euer.krebsco.de/remote.php/dav";
|
url = "https://o.euer.krebsco.de/remote.php/dav";
|
||||||
|
# make calendars "all-day" before uploading:
|
||||||
|
# sed -i -e 's/^\(DTSTART;.*\)T......\r$/\1\r/' -e # 's/^\(DTEND;.*\)T......\r$/\1\r/' abfall.ical
|
||||||
|
custom_calendars = [
|
||||||
|
{
|
||||||
|
name = "Gelbersack";
|
||||||
|
calendar = "Abfall";
|
||||||
|
search = "Gelber Sack.*";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Biomuell";
|
||||||
|
calendar = "Abfall";
|
||||||
|
search = "Bio.*";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Restmuell";
|
||||||
|
calendar = "Abfall";
|
||||||
|
search = "Rest.*";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Papiermuell";
|
||||||
|
calendar = "Abfall";
|
||||||
|
search = "Altpapier.*";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Kehrwoche";
|
||||||
|
calendar = "Kehrwoche";
|
||||||
|
search = ".*";
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,8 @@ in {
|
|||||||
./automation/firetv_restart.nix
|
./automation/firetv_restart.nix
|
||||||
./automation/light_buttons.nix
|
./automation/light_buttons.nix
|
||||||
./automation/wohnzimmer_rf_fernbedienung.nix
|
./automation/wohnzimmer_rf_fernbedienung.nix
|
||||||
./automation/giesskanne.nix
|
#./automation/giesskanne.nix
|
||||||
|
./automation/pflanzen_giessen_erinnerung.nix
|
||||||
#./automation/urlaub.nix
|
#./automation/urlaub.nix
|
||||||
./automation/moodlight.nix
|
./automation/moodlight.nix
|
||||||
|
|
||||||
@ -48,7 +49,9 @@ in {
|
|||||||
})).override {
|
})).override {
|
||||||
extraPackages = p: [
|
extraPackages = p: [
|
||||||
(p.callPackage ./deps/dwdwfsapi.nix {})
|
(p.callPackage ./deps/dwdwfsapi.nix {})
|
||||||
(p.callPackage ./deps/pykodi.nix {}) ];
|
(p.callPackage ./signal-rest/pkg.nix {})
|
||||||
|
#(p.callPackage ./deps/pykodi.nix {})
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
@ -103,11 +106,11 @@ in {
|
|||||||
# (builtins.readFile <secrets/hass/telegram-bot.json>))
|
# (builtins.readFile <secrets/hass/telegram-bot.json>))
|
||||||
#];
|
#];
|
||||||
notify = [
|
notify = [
|
||||||
{
|
#{
|
||||||
platform = "kodi";
|
# platform = "kodi";
|
||||||
name = "Kodi Wohnzimmer";
|
# name = "Kodi Wohnzimmer";
|
||||||
host = firetv_stick;
|
# host = firetv_stick;
|
||||||
}
|
#}
|
||||||
{
|
{
|
||||||
platform = "nfandroidtv";
|
platform = "nfandroidtv";
|
||||||
name = "FireTV Wohnzimmer";
|
name = "FireTV Wohnzimmer";
|
||||||
@ -166,8 +169,10 @@ in {
|
|||||||
};
|
};
|
||||||
#binary_sensor =
|
#binary_sensor =
|
||||||
# flurlicht.binary_sensor;
|
# flurlicht.binary_sensor;
|
||||||
|
|
||||||
sensor = [
|
sensor = [
|
||||||
{ platform = "speedtest";
|
{ platform = "speedtestdotnet";
|
||||||
|
scan_interval.hours = 6;
|
||||||
monitored_conditions = [ "ping" "download" "upload" ];
|
monitored_conditions = [ "ping" "download" "upload" ];
|
||||||
}
|
}
|
||||||
# https://www.home-assistant.io/cookbook/automation_for_rainy_days/
|
# https://www.home-assistant.io/cookbook/automation_for_rainy_days/
|
||||||
|
@ -5,9 +5,10 @@
|
|||||||
|
|
||||||
# Needs:
|
# Needs:
|
||||||
# sensor.zigbee_btn1_click
|
# sensor.zigbee_btn1_click
|
||||||
# notify.telegrambot
|
# notify.signal_home
|
||||||
let
|
let
|
||||||
button = "sensor.zigbee_btn2_click";
|
button = "sensor.zigbee_btn2_click";
|
||||||
|
notify = "notify.signal_home";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.home-assistant.config = {
|
services.home-assistant.config = {
|
||||||
@ -56,7 +57,7 @@ in
|
|||||||
data.duration = "00:05:00";
|
data.duration = "00:05:00";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
service = "notify.telegrambot";
|
service = notify;
|
||||||
data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend ";
|
data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend ";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@ -79,7 +80,7 @@ in
|
|||||||
entity_id = "script.add_5_minutes_to_kurzzeitwecker";
|
entity_id = "script.add_5_minutes_to_kurzzeitwecker";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
service = "notify.telegrambot";
|
service = notify;
|
||||||
data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend '';
|
data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend '';
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@ -111,7 +112,7 @@ in
|
|||||||
entity_id = "timer.kurzzeitwecker";
|
entity_id = "timer.kurzzeitwecker";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
service = "notify.telegrambot";
|
service = notify;
|
||||||
data.message = "Timer gestoppt, abgebrochen";
|
data.message = "Timer gestoppt, abgebrochen";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@ -125,7 +126,7 @@ in
|
|||||||
};
|
};
|
||||||
action = [
|
action = [
|
||||||
{
|
{
|
||||||
service = "notify.telegrambot";
|
service = notify;
|
||||||
data.message = "Timer beendet";
|
data.message = "Timer beendet";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
@ -1,18 +1,6 @@
|
|||||||
|
{
|
||||||
let
|
imports = [
|
||||||
port = 8631;
|
./service.nix
|
||||||
image = "bbernhard/signal-cli-rest-api:latest";
|
./hass.nix
|
||||||
config = "/var/lib/signal-cli-config";
|
|
||||||
in {
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${config} docker docker - -"
|
|
||||||
];
|
];
|
||||||
state = [ config ];
|
|
||||||
virtualisation.oci-containers.containers.signal-rest = {
|
|
||||||
image = image;
|
|
||||||
ports = [ "127.0.0.1:${toString port}:8080" ];
|
|
||||||
volumes = [
|
|
||||||
"${config}:/home/.local/share/signal-cli"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
20
makefu/2configs/home/ham/signal-rest/hass.nix
Normal file
20
makefu/2configs/home/ham/signal-rest/hass.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
let
|
||||||
|
inherit (import <secrets/signal/messenger.nix>) number home felix;
|
||||||
|
in {
|
||||||
|
services.home-assistant.config.notify = [
|
||||||
|
{
|
||||||
|
name = "signal_home";
|
||||||
|
platform = "signal_messenger";
|
||||||
|
url = "http://127.0.0.1:8631";
|
||||||
|
inherit number ;
|
||||||
|
recipients = [ home ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "signal_felix";
|
||||||
|
platform = "signal_messenger";
|
||||||
|
url = "http://127.0.0.1:8631";
|
||||||
|
inherit number;
|
||||||
|
recipients = [ felix ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
25
makefu/2configs/home/ham/signal-rest/pkg.nix
Normal file
25
makefu/2configs/home/ham/signal-rest/pkg.nix
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pysignalclirestapi";
|
||||||
|
version = "0.3.14";
|
||||||
|
|
||||||
|
# disabled = ; # requires python version >=2.7
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "6f3626b594a53c4161dfc67ea7a3b23d62c8fe8cb404a909496118aeefa79cd0";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Small python library for the Signal Cli REST API";
|
||||||
|
homepage = https://github.com/bbernhard/pysignalclirestapi;
|
||||||
|
#license = licenses.;
|
||||||
|
# maintainers = [ maintainers. ];
|
||||||
|
};
|
||||||
|
}
|
18
makefu/2configs/home/ham/signal-rest/service.nix
Normal file
18
makefu/2configs/home/ham/signal-rest/service.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
|
||||||
|
let
|
||||||
|
port = 8631;
|
||||||
|
image = "bbernhard/signal-cli-rest-api:latest";
|
||||||
|
config = "/var/lib/signal-cli-config";
|
||||||
|
in {
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d ${config} docker docker - -"
|
||||||
|
];
|
||||||
|
state = [ config ];
|
||||||
|
virtualisation.oci-containers.containers.signal-rest = {
|
||||||
|
image = image;
|
||||||
|
ports = [ "127.0.0.1:${toString port}:8080" ];
|
||||||
|
volumes = [
|
||||||
|
"${config}:/home/.local/share/signal-cli"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@ -40,7 +40,6 @@ in
|
|||||||
log_output = [ "console" ];
|
log_output = [ "console" ];
|
||||||
last_seen = "ISO_8601";
|
last_seen = "ISO_8601";
|
||||||
elapsed = true;
|
elapsed = true;
|
||||||
reporting = true; # TODO test if it is better with groups
|
|
||||||
pan_id = 6755;
|
pan_id = 6755;
|
||||||
inherit (sec.zigbee) network_key;
|
inherit (sec.zigbee) network_key;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user