From 8e7a845c444607736bd1c9b7548aa26f22ea5bf3 Mon Sep 17 00:00:00 2001 From: makefu <github@syntax-fehler.de> Date: Wed, 25 Sep 2019 14:03:46 +0200 Subject: [PATCH] ma bureautomation: combination -> multi --- 2configs/bureautomation/default.nix | 7 ++++--- .../bureautomation/{combination => multi}/10h_timers.nix | 9 ++++----- 2configs/bureautomation/{combination => multi}/README.md | 0 .../bureautomation/{combination => multi}/matrix.nix | 0 .../{combination => multi}/mittagessen.nix | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename 2configs/bureautomation/{combination => multi}/10h_timers.nix (96%) rename 2configs/bureautomation/{combination => multi}/README.md (100%) rename 2configs/bureautomation/{combination => multi}/matrix.nix (100%) rename 2configs/bureautomation/{combination => multi}/mittagessen.nix (100%) diff --git a/2configs/bureautomation/default.nix b/2configs/bureautomation/default.nix index 8ec9dac..ba2e564 100644 --- a/2configs/bureautomation/default.nix +++ b/2configs/bureautomation/default.nix @@ -1,9 +1,10 @@ { config, pkgs, lib, ... }: let kodi-host = "192.168.8.11"; - ten_hours = import ./combination/10h_timers.nix { inherit lib; }; # provides: timer automation script - mittagessen = import ./combination/mittagessen.nix { inherit lib; }; # provides: automation script - matrix = import ./combination/matrix.nix { inherit lib; }; # provides: matrix automation + ten_hours = import ./multi/10h_timers.nix { inherit lib; }; # provides: timer automation script + mittagessen = import ./multi/mittagessen.nix { inherit lib; }; # provides: automation script + matrix = import ./multi/matrix.nix { inherit lib; }; # provides: matrix automation + aramark = import ./multi/aramark.nix { inherit lib; }; # provides: pommes sensor in { imports = [ ./ota.nix diff --git a/2configs/bureautomation/combination/10h_timers.nix b/2configs/bureautomation/multi/10h_timers.nix similarity index 96% rename from 2configs/bureautomation/combination/10h_timers.nix rename to 2configs/bureautomation/multi/10h_timers.nix index dec5347..53bfd37 100644 --- a/2configs/bureautomation/combination/10h_timers.nix +++ b/2configs/bureautomation/multi/10h_timers.nix @@ -1,7 +1,6 @@ {lib, ... }: let - persons = [ "frank" "daniel" "thorsten" "carsten" "thierry" "ecki" "felix" - "anthony" # antony + persons = [ "frank" "daniel" "thorsten" "carsten" "ecki" "felix" "thierry" # tjeri ]; random_zu_lange = name: ''{{ [ @@ -45,7 +44,7 @@ let "Im Kalender von ${name} sind heute acht Meetings eingeplant, von denen zwei bereits verpasst wurden", "Das Postfach von ${name} beinhaltet einhundertachtundzwanzig ungelesene E-Mails.", "Nachricht von Serge: ${name}, bitte melden Sie sich Umgehend bei mir im Büro!", - "Luftqualität hat sich durch das Eintreffen von ${name} um zweihunder Punkte verschlechtert, bitte alle Fenster öffnen.", + "Luftqualität hat sich durch das Eintreffen von ${name} um zweihundert Punkte verschlechtert, bitte alle Fenster öffnen.", "Die Tür geht auf, wer mag das sein? Schon schreitet hier der ${name} ein. Das Volk, es jubelt, Dirnen schmachten. Fürs Festmahl beginnt man schon zu schlachten. Er wird nur nach dem besten streben! Der ${name}, er soll lange leben!", "${name} arbeitet gern für seinen Konzern", "${name} ist nur froh im Großraumbüro", @@ -147,8 +146,8 @@ let entity_id = [ "timer.${name}_10h" ] ; } { service = "homeassistant.turn_on"; - entity_id = [ - # "script.buzz_${name}" + entity_id = [ + "switch.fernseher" "script.blitz_10s" "script.announce_${name}" ]; diff --git a/2configs/bureautomation/combination/README.md b/2configs/bureautomation/multi/README.md similarity index 100% rename from 2configs/bureautomation/combination/README.md rename to 2configs/bureautomation/multi/README.md diff --git a/2configs/bureautomation/combination/matrix.nix b/2configs/bureautomation/multi/matrix.nix similarity index 100% rename from 2configs/bureautomation/combination/matrix.nix rename to 2configs/bureautomation/multi/matrix.nix diff --git a/2configs/bureautomation/combination/mittagessen.nix b/2configs/bureautomation/multi/mittagessen.nix similarity index 100% rename from 2configs/bureautomation/combination/mittagessen.nix rename to 2configs/bureautomation/multi/mittagessen.nix