From 3479c83b4b3240c2c74b061ab9098c1d509141a1 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jul 2020 22:31:40 +0200 Subject: [PATCH 1/7] ma: fix build errors - rip google-muell - sdev.r: deploy home-manager --- makefu/1systems/cake/config.nix | 2 +- makefu/1systems/omo/config.nix | 2 -- makefu/1systems/sdev/source.nix | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix index eaaac8f41..3befa201d 100644 --- a/makefu/1systems/cake/config.nix +++ b/makefu/1systems/cake/config.nix @@ -10,7 +10,7 @@ in { # - + # # configure your hw: # ]; diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 423ebb4c6..dd89b4057 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -87,12 +87,10 @@ in { # # TODO: - # - { makefu.ps3netsrv = { diff --git a/makefu/1systems/sdev/source.nix b/makefu/1systems/sdev/source.nix index 2e085740a..d6c3d2031 100644 --- a/makefu/1systems/sdev/source.nix +++ b/makefu/1systems/sdev/source.nix @@ -1,3 +1,7 @@ { name="sdev"; + home-manager = true; + hw = true; + mic92 = true; + unstable = true; } From 2be4fecf5ad01e565fca211781fb9556a16481c3 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jul 2020 22:32:51 +0200 Subject: [PATCH 2/7] ma wbob.r: deploy home-manager --- makefu/1systems/wbob/source.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index c76f73760..6568b8a45 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,4 +1,5 @@ { name="wbob"; # musnix = true; + home-manager = true; } From bf4438e815cb40a1d808510bbe378ac9010574fb Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jul 2020 22:54:37 +0200 Subject: [PATCH 3/7] ma tsp.r: add home-manager source --- makefu/1systems/tsp/source.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/1systems/tsp/source.nix b/makefu/1systems/tsp/source.nix index 9abf503e2..afb05e296 100644 --- a/makefu/1systems/tsp/source.nix +++ b/makefu/1systems/tsp/source.nix @@ -2,4 +2,5 @@ name="tsp"; full = true; hw = true; + home-manager = true; } From 52d85f456bb4e320e860eb39c13ed8515b29287a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jul 2020 23:09:49 +0200 Subject: [PATCH 4/7] ma tsp.r,wbob.r,sdev.r: include home-manager --- makefu/1systems/sdev/config.nix | 1 + makefu/1systems/tsp/config.nix | 1 + makefu/1systems/wbob/config.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 66f822c02..e3c59e181 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -5,6 +5,7 @@ imports = [ # Include the results of the hardware scan. + # # broken since 2019-04-18 { # until virtualbox-image is fixed diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index bbfaebd44..7c65737f7 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -7,6 +7,7 @@ imports = [ # Include the results of the hardware scan. + # diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index d8cf380e7..9d0c7af61 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -9,6 +9,7 @@ in { imports = [ # Include the results of the hardware scan. + From 4e42bac12944def736921d43b08bbec6f01dbd94 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jul 2020 23:57:45 +0200 Subject: [PATCH 5/7] shack/glados: fix announcement temperature --- krebs/2configs/shack/glados/automation/announcement.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/shack/glados/automation/announcement.j2 b/krebs/2configs/shack/glados/automation/announcement.j2 index d3838bb33..2ae5f1a46 100644 --- a/krebs/2configs/shack/glados/automation/announcement.j2 +++ b/krebs/2configs/shack/glados/automation/announcement.j2 @@ -1,6 +1,6 @@ Willkommen werter Keyholder {{ states("sensor.keyholder") }} in deinem Lieblingshackerspace. -Es ist {{states("sensor.temperature") | round(1) | replace('.',' Komma ')}} Grad {% if states("sensor.temperature")|float > 25 %}heiss{%elif states("sensor.temperature")|float > 15%}warm{%else%}kalt{%endif%} bei {% if states("sensor.humidity") | int <45 %}trockenen{% elif states("sensor.humidity") | int <65 %}angenehmen{%else%}feuchten{%endif%} {{states("sensor.humidity") | int }} Prozent Luftfeuchtigkeit. +Es ist {{states("sensor.fablab_feinstaub_temperature") | round(1) | replace('.',' Komma ')}} Grad {% if states("sensor.fablab_feinstaub_temperature")|float > 25 %}heiss{%elif states("sensor.fablab_feinstaub_temperature")|float > 15%}warm{%else%}kalt{%endif%} bei {% if states(" sensor.rz_feinstaub_humidity") | int <45 %}trockenen{% elif states(" sensor.rz_feinstaub_humidity") | int <65 %}angenehmen{%else%}feuchten{%endif%} {{states(" sensor.rz_feinstaub_humidity") | int }} Prozent Luftfeuchtigkeit. {% if (states("sensor.fullstand_mate_1")|int == 0) and states("sensor.fullstand_mate_2")|int == 0 %}ES IST MAHTECALYPSE, BEIDE MAHTESCHÄCHTE SIND LEER! {%if states("sensor.fullstand_mate_cola")| int == 0%} UND SOGAR DIE COLA IST ALLE. Ihr seid sowas von am Arsch!{%else%}Zum Glück gibt es noch Cola, Phew!{%endif%} From 9b39afa417d4626ba06d21cad392281364f92a1a Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 20 Jul 2020 17:24:09 +0200 Subject: [PATCH 6/7] ma bureautomation: fix matrix bot --- makefu/2configs/bureautomation/multi/matrix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/bureautomation/multi/matrix.nix b/makefu/2configs/bureautomation/multi/matrix.nix index 85ba31986..babc5d29a 100644 --- a/makefu/2configs/bureautomation/multi/matrix.nix +++ b/makefu/2configs/bureautomation/multi/matrix.nix @@ -52,7 +52,7 @@ in { }; action = { service = "notify.matrix_notify"; - data_template.message = "Temp: {{states.sensor.easy2_dht22_temperature.state_with_unit}} Hum:{{states.sensor.easy2_dht22_humidity.state_with_unit}} airquality:{{states.sensor.air_quality.state_with_unit}}"; + data_template.message = "Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}"; }; } From d1989632cfd88a747c98c3a0edab45922fbf1884 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 20 Jul 2020 17:40:38 +0200 Subject: [PATCH 7/7] ma bam: fix matrix.nix syntax --- makefu/2configs/bureautomation/multi/matrix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/bureautomation/multi/matrix.nix b/makefu/2configs/bureautomation/multi/matrix.nix index babc5d29a..4fcfe8da4 100644 --- a/makefu/2configs/bureautomation/multi/matrix.nix +++ b/makefu/2configs/bureautomation/multi/matrix.nix @@ -52,7 +52,7 @@ in { }; action = { service = "notify.matrix_notify"; - data_template.message = "Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}"; + data_template.message = ''Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}''; }; }