Merge remote-tracking branch 'gum/master'

10 files changed, 12 insertions, 5 deletions

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%}
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 {
     <stockholm/makefu/2configs/binary-cache/nixos.nix>
     #<stockholm/makefu/2configs/support-nixos.nix>
     <stockholm/makefu/2configs/homeautomation/default.nix>
-    <stockholm/makefu/2configs/homeautomation/google-muell.nix>
+    # <stockholm/makefu/2configs/homeautomation/google-muell.nix>
     # configure your hw:
     # <stockholm/makefu/2configs/save-diskspace.nix>
   ];
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 {
       # <stockholm/makefu/2configs/syncthing.nix>
       <stockholm/makefu/2configs/remote-build/slave.nix>
       # TODO:
-      # <stockholm/makefu/2configs/deployment/google-muell.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
 
       <stockholm/makefu/2configs/ham>
-      <stockholm/makefu/2configs/ham/google-muell.nix>
       <stockholm/makefu/2configs/ham/zigbee2mqtt>
       {
         makefu.ps3netsrv = {
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.
       <stockholm/makefu>
+      <stockholm/makefu/2configs/home-manager>
 
       # <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18
       { # until virtualbox-image is fixed
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;
 }
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.
       <stockholm/makefu>
+      <stockholm/makefu/2configs/home-manager>
       <stockholm/makefu/2configs/main-laptop.nix>
       # <stockholm/makefu/2configs/tools/all.nix>
       <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
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;
 }
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.
       <stockholm/makefu>
+      <stockholm/makefu/2configs/home-manager>
       <stockholm/makefu/2configs/support-nixos.nix>
       <stockholm/makefu/2configs/zsh-user.nix>
       <stockholm/makefu/2configs/tools/core.nix>
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;
 }
diff --git a/makefu/2configs/bureautomation/multi/matrix.nix b/makefu/2configs/bureautomation/multi/matrix.nix
index 85ba31986..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.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}}'';
       };
     }