ma bureautomation: move to 20.09 style imports

29 files changed, 794 insertions, 751 deletions

diff --git a/makefu/2configs/bureautomation/automation/bureau-shutdown.nix b/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
index b9aa710c3..f4c10adc8 100644
--- a/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
+++ b/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
@@ -1,84 +1,87 @@
-[
-  { alias = "Turn on Fernseher on group home";
-    trigger = {
-      platform = "state";
-      entity_id = "group.team";
-      from = "not_home";
-      to = "home";
-      for.seconds = 30;
-    };
-    action = [
-      {
-        service = "homeassistant.turn_on";
-        entity_id =  [
-          "switch.fernseher"
-          "switch.feuer"
-        ];
-      }
-      {
-        service = "media_player.kodi_call_method";
-        data = {
-          entity_id = "media_player.kodi";
-          method = "Player.Open";
-          item.partymode = "music";
-        };
-      }
-      {
-        service = "notify.telegrambot";
-        data = {
-          title = "Bureau Startup";
-          message = "Das Büro wurde eröffnet";
-        };
-      }
-    ];
-  }
-  { alias = "Turn off Fernseher after last in group left";
-    trigger = [
-      { # trigger when movement was detected at the time
+{
+  services.home-assistant.config.automation =
+  [
+    { alias = "Turn on Fernseher on group home";
+      trigger = {
         platform = "state";
         entity_id = "group.team";
-        from = "home";
-        to = "not_home";
-      }
-      { # trigger at 18:00 no matter what
-        # to avoid 'everybody left before 18:00:00'
-        platform = "time";
-        at = "18:00:00";
-      }
-    ];
-    action = [
-      {
-        service = "homeassistant.turn_off";
-        entity_id =  [
-          "switch.fernseher"
-          "switch.feuer"
-          "light.status_felix"
-          "light.status_daniel"
-        ];
-      }
-      {
-        service = "notify.telegrambot";
-        data_template = {
-          title = "Bureau Shutdown";
-          message = "All devices are turned off due to {{ trigger.platform }}";
-        };
-      }
-    ];
-    condition =
-    { condition = "and";
-      conditions = [
+        from = "not_home";
+        to = "home";
+        for.seconds = 30;
+      };
+      action = [
+        {
+          service = "homeassistant.turn_on";
+          entity_id =  [
+            "switch.fernseher"
+            "switch.feuer"
+          ];
+        }
         {
-          condition = "time";
-          before = "06:30:00"; #only turn off between 6:30 and 18:00
-          after  = "18:00:00";
-          # weekday = [ "mon" "tue" "wed" "thu" "fri" ];
+          service = "media_player.kodi_call_method";
+          data = {
+            entity_id = "media_player.kodi";
+            method = "Player.Open";
+            item.partymode = "music";
+          };
         }
-        { # if anybody is still there
-          condition = "state";
+        {
+          service = "notify.telegrambot";
+          data = {
+            title = "Bureau Startup";
+            message = "Das Büro wurde eröffnet";
+          };
+        }
+      ];
+    }
+    { alias = "Turn off Fernseher after last in group left";
+      trigger = [
+        { # trigger when movement was detected at the time
+          platform = "state";
           entity_id = "group.team";
-          state = "not_home";
+          from = "home";
+          to = "not_home";
+        }
+        { # trigger at 18:00 no matter what
+          # to avoid 'everybody left before 18:00:00'
+          platform = "time";
+          at = "18:00:00";
         }
       ];
-    };
-  }
-]
+      action = [
+        {
+          service = "homeassistant.turn_off";
+          entity_id =  [
+            "switch.fernseher"
+            "switch.feuer"
+            "light.status_felix"
+            "light.status_daniel"
+          ];
+        }
+        {
+          service = "notify.telegrambot";
+          data_template = {
+            title = "Bureau Shutdown";
+            message = "All devices are turned off due to {{ trigger.platform }}";
+          };
+        }
+      ];
+      condition =
+      { condition = "and";
+        conditions = [
+          {
+            condition = "time";
+            before = "06:30:00"; #only turn off between 6:30 and 18:00
+            after  = "18:00:00";
+            # weekday = [ "mon" "tue" "wed" "thu" "fri" ];
+          }
+          { # if anybody is still there
+            condition = "state";
+            entity_id = "group.team";
+            state = "not_home";
+          }
+        ];
+      };
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/automation/hass-restart.nix b/makefu/2configs/bureautomation/automation/hass-restart.nix
index be16f6966..3b3ce0599 100644
--- a/makefu/2configs/bureautomation/automation/hass-restart.nix
+++ b/makefu/2configs/bureautomation/automation/hass-restart.nix
@@ -1,31 +1,34 @@
-[
-  { alias = "State on HA start-up";
-  trigger = {
-      platform = "homeassistant";
-      event = "start";
-    };
-    action = [
-      # Startup State
-      { service = "mqtt.publish";
-        data = {
-          topic = "/bam/sonoffs/cmnd/state";
-          payload = "";
-        };
-      }
-      # Firmware Version
-      { service = "mqtt.publish";
-        data = {
-          topic = "/bam/sonoffs/cmnd/status";
-          payload = "2";
-        };
-      }
-      # Will trigger restart of all devices!
-      #{ service = "mqtt.publish";
-      #  data = {
-      #    topic = "sonoffs/cmnd/SetOption59"; # configure sending state on power change
-      #    payload = "1";
-      #  };
-      #}
-    ];
-  }
-]
+{
+  services.home-assistant.config.automation =
+  [
+    { alias = "State on HA start-up";
+    trigger = {
+        platform = "homeassistant";
+        event = "start";
+      };
+      action = [
+        # Startup State
+        { service = "mqtt.publish";
+          data = {
+            topic = "/bam/sonoffs/cmnd/state";
+            payload = "";
+          };
+        }
+        # Firmware Version
+        { service = "mqtt.publish";
+          data = {
+            topic = "/bam/sonoffs/cmnd/status";
+            payload = "2";
+          };
+        }
+        # Will trigger restart of all devices!
+        #{ service = "mqtt.publish";
+        #  data = {
+        #    topic = "sonoffs/cmnd/SetOption59"; # configure sending state on power change
+        #    payload = "1";
+        #  };
+        #}
+      ];
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/automation/nachtlicht.nix b/makefu/2configs/bureautomation/automation/nachtlicht.nix
index ec6fa20c7..ade89418d 100644
--- a/makefu/2configs/bureautomation/automation/nachtlicht.nix
+++ b/makefu/2configs/bureautomation/automation/nachtlicht.nix
@@ -1,35 +1,38 @@
-[
-  # TODO: trigger if it is before dusk and somebody arives but nachtlichter are
-  # off from last day
-  # TODO: do not have nachtlicht turned on at night
-  {
-    alias = "Turn on Nachtlicht at dusk"; # when it gets dim
-    trigger =
-    { platform = "numeric_state";
-      entity_id = "sun.sun";
-      value_template = "{{ state.attributes.elevation }}";
-      below = 10;
+{
+  services.home-assistant.config.automation =
+  [
+    # TODO: trigger if it is before dusk and somebody arives but nachtlichter are
+    # off from last day
+    # TODO: do not have nachtlicht turned on at night
+    {
+      alias = "Turn on Nachtlicht at dusk"; # when it gets dim
+      trigger =
+      { platform = "numeric_state";
+        entity_id = "sun.sun";
+        value_template = "{{ state.attributes.elevation }}";
+        below = 10;
 
-    };
-    action =
-    { service = "homeassistant.turn_on";
-      entity_id =  [ "group.nachtlicht" ];
-    };
-  }
-  {
-    alias = "Turn off Nachtlicht at dawn";
-    trigger =
-    { platform = "sun";
-      event = "sunrise";
-      offset = "01:30:00"; # on dawn
-    };
-    # TODO: when somebody is still in the buero
-    # condition = 
-    #{
-    #};
-    action =
-    { service = "homeassistant.turn_off";
-      entity_id =  [ "group.nachtlicht" ];
-    };
-  }
-]
+      };
+      action =
+      { service = "homeassistant.turn_on";
+        entity_id =  [ "group.nachtlicht" ];
+      };
+    }
+    {
+      alias = "Turn off Nachtlicht at dawn";
+      trigger =
+      { platform = "sun";
+        event = "sunrise";
+        offset = "01:30:00"; # on dawn
+      };
+      # TODO: when somebody is still in the buero
+      # condition = 
+      #{
+      #};
+      action =
+      { service = "homeassistant.turn_off";
+        entity_id =  [ "group.nachtlicht" ];
+      };
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/automation/schlechteluft.nix b/makefu/2configs/bureautomation/automation/schlechteluft.nix
index 370334743..ea1d44515 100644
--- a/makefu/2configs/bureautomation/automation/schlechteluft.nix
+++ b/makefu/2configs/bureautomation/automation/schlechteluft.nix
@@ -1,71 +1,75 @@
 let
   long_threshold = 30;
-in [
-  {
-    alias = "Bad Air Alarm 60 seconds";
-    trigger =
-    { platform = "numeric_state";
-      entity_id = "sensor.air_quality";
-      above = 1523;
-      for.seconds = 60;
-    };
-    condition = {
-      condition = "and";
-      conditions = [
-        { condition = "state";
-          entity_id = "group.team";
-          state = "home";
-        }
-        { condition = "time";
-          after   = "06:00:00";
-          before  = "20:00:00";
+in
+{
+  services.home-assistant.config.automation =
+  [
+    {
+      alias = "Bad Air Alarm 60 seconds";
+      trigger =
+      { platform = "numeric_state";
+        entity_id = "sensor.air_quality";
+        above = 1523;
+        for.seconds = 60;
+      };
+      condition = {
+        condition = "and";
+        conditions = [
+          { condition = "state";
+            entity_id = "group.team";
+            state = "home";
+          }
+          { condition = "time";
+            after   = "06:00:00";
+            before  = "20:00:00";
+          }
+        ];
+      };
+
+      action = [
+        { service = "homeassistant.turn_on";
+          entity_id = [
+            "script.schlechteluft"
+          ];
         }
       ];
-    };
-
-    action = [
-      { service = "homeassistant.turn_on";
-        entity_id = [
-          "script.schlechteluft"
+    }
+    {
+      alias = "Bad Air Alarm ${toString long_threshold} Minutes";
+      trigger =
+      { platform = "numeric_state";
+        entity_id = "sensor.air_quality";
+        above = 1523;
+        for.minutes = long_threshold;
+      };
+      condition = {
+        condition = "and";
+        conditions = [
+          { condition = "state";
+            entity_id = "group.team";
+            state = "home";
+          }
+          { condition = "time";
+            after   = "06:00:00";
+            before  = "20:00:00";
+          }
         ];
-      }
-    ];
-  }
-  {
-    alias = "Bad Air Alarm ${toString long_threshold} Minutes";
-    trigger =
-    { platform = "numeric_state";
-      entity_id = "sensor.air_quality";
-      above = 1523;
-      for.minutes = long_threshold;
-    };
-    condition = {
-      condition = "and";
-      conditions = [
-        { condition = "state";
-          entity_id = "group.team";
-          state = "home";
+      };
+
+      action = [
+        { service = "homeassistant.turn_on";
+          entity_id = [
+            "script.schlechteluft"
+          ];
         }
-        { condition = "time";
-          after   = "06:00:00";
-          before  = "20:00:00";
+        { service = "tts.google_say";
+          entity_id =  "media_player.mpd";
+          data_template = {
+            message = "BEEP BEEP - Die luft ist schon ${toString long_threshold} Minuten schlecht! Student Nummer {{ range(1,500) | random }}, öffne ein Fenster.";
+            language = "de";
+          };
         }
       ];
-    };
-
-    action = [
-      { service = "homeassistant.turn_on";
-        entity_id = [
-          "script.schlechteluft"
-        ];
-      }
-      { service = "tts.google_say";
-        entity_id =  "media_player.mpd";
-        data_template = {
-          message = "BEEP BEEP - Die luft ist schon ${toString long_threshold} Minuten schlecht! Student Nummer {{ range(1,500) | random }}, öffne ein Fenster.";
-          language = "de";
-        };
-      }
-    ];
-  }
-]
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/binary_sensor/buttons.nix b/makefu/2configs/bureautomation/binary_sensor/buttons.nix
index e23c4a362..20590a6b3 100644
--- a/makefu/2configs/bureautomation/binary_sensor/buttons.nix
+++ b/makefu/2configs/bureautomation/binary_sensor/buttons.nix
@@ -12,6 +12,9 @@ let
     # expire_after = "5"; #expire after 5 seconds
     qos = 1;
   };
-in [
-  (tasmota_button "RedButton" "redbutton")
-]
+in {
+  services.home-assistant.config.binary_sensor =
+    [
+    (tasmota_button "RedButton" "redbutton")
+  ];
+}
diff --git a/makefu/2configs/bureautomation/binary_sensor/motion.nix b/makefu/2configs/bureautomation/binary_sensor/motion.nix
index ad8fab038..0c5a808e0 100644
--- a/makefu/2configs/bureautomation/binary_sensor/motion.nix
+++ b/makefu/2configs/bureautomation/binary_sensor/motion.nix
@@ -1,12 +1,15 @@
-[
-  { platform = "mqtt";
-    device_class = "motion";
-    name = "Motion";
-    state_topic = "/bam/easy2/movement/Switch";
-    payload_on = "1";
-    payload_off = "0";
-    availability_topic = "/bam/easy2/tele/LWT";
-    payload_available = "Online";
-    payload_not_available = "Offline";
-  }
-]
+{
+  services.home-assistant.config.binary_sensor =
+  [
+    { platform = "mqtt";
+      device_class = "motion";
+      name = "Motion";
+      state_topic = "/bam/easy2/movement/Switch";
+      payload_on = "1";
+      payload_off = "0";
+      availability_topic = "/bam/easy2/tele/LWT";
+      payload_available = "Online";
+      payload_not_available = "Offline";
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/camera/comic.nix b/makefu/2configs/bureautomation/camera/comic.nix
index a523d032e..ae24760e3 100644
--- a/makefu/2configs/bureautomation/camera/comic.nix
+++ b/makefu/2configs/bureautomation/camera/comic.nix
@@ -1,10 +1,13 @@
-[
-  { name = "Poorly Drawn Lines";
-    platform = "generic";
-    still_image_url = http://127.0.0.1:8123/local/lines.png ;
-  }
-  { name = "XKCD";
-    platform = "generic";
-    still_image_url = http://127.0.0.1:8123/local/xkcd.png ;
-  }
-]
+{
+  services.home-assistant.config.camera =
+  [
+    { name = "Poorly Drawn Lines";
+      platform = "generic";
+      still_image_url = http://127.0.0.1:8123/local/lines.png ;
+    }
+    { name = "XKCD";
+      platform = "generic";
+      still_image_url = http://127.0.0.1:8123/local/xkcd.png ;
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/camera/stuttgart.nix b/makefu/2configs/bureautomation/camera/stuttgart.nix
index 78cbeb3e2..0badcb285 100644
--- a/makefu/2configs/bureautomation/camera/stuttgart.nix
+++ b/makefu/2configs/bureautomation/camera/stuttgart.nix
@@ -5,22 +5,26 @@ let
     inherit name still_image_url;
     platform = "generic";
   };
-in [
-  ( cam "Max-Eyth-See" https://www.wav-stuttgart.de/webcam/_/webcam1.jpg  )
-  ( cam "Wilhelma" http://webcam.wilhelma.de/webcam02/webcam02.jpg )
-  ( cam "Marktplatz" https://webcam.stuttgart.de/wcam007/current.jpg )
-  ( cam "Schoch Areal" https://webcam.stuttgart.de/wcam004/current.jpg )
-  ( cam "Leuze" https://webcam.stuttgart.de/wcam005/current.jpg )
-  ( cam "Straße Wilhelma" https://webcam.stuttgart.de/wcam006/current.jpg )
-  ( cam "Fernsehturm 1" http://webcam.fernsehturmstuttgart.com/current.jpg )
-  ( cam "Fernsehturm 2" http://webcam.fernsehturmstuttgart.com/current2.jpg )
-  ( cam "Feuerbach Lemberg" http://www.regio7.de/handy/current.jpg )
-  ( cam "Flughafen Stuttgart 1" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam2.jpg )
-  ( cam "Flughafen Stuttgart 2" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam5.jpg )
-  ( cam "Flughafen Stuttgart 3" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam7.jpg )
-  ( cam "S21 1" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-03/s21-turm03.jpg )
-  ( cam "S21 2" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-02/s21-turm-02.jpg )
-  ( cam "S21 3" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-01/s21-turm-01.jpg )
-  ( cam "S21 4" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Jaegerstrasse-Nordkopf/s21-jaegerstrassse-nordkopf.jpg )
-  ( cam "S21 5" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Bahndirektion-Nord/S21-Bundesbahndirektion-Nord.jpg )
-]
+in
+{
+  services.home-assistant.config.camera =
+  [
+    ( cam "Max-Eyth-See" https://www.wav-stuttgart.de/webcam/_/webcam1.jpg  )
+    ( cam "Wilhelma" http://webcam.wilhelma.de/webcam02/webcam02.jpg )
+    ( cam "Marktplatz" https://webcam.stuttgart.de/wcam007/current.jpg )
+    ( cam "Schoch Areal" https://webcam.stuttgart.de/wcam004/current.jpg )
+    ( cam "Leuze" https://webcam.stuttgart.de/wcam005/current.jpg )
+    ( cam "Straße Wilhelma" https://webcam.stuttgart.de/wcam006/current.jpg )
+    ( cam "Fernsehturm 1" http://webcam.fernsehturmstuttgart.com/current.jpg )
+    ( cam "Fernsehturm 2" http://webcam.fernsehturmstuttgart.com/current2.jpg )
+    ( cam "Feuerbach Lemberg" http://www.regio7.de/handy/current.jpg )
+    ( cam "Flughafen Stuttgart 1" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam2.jpg )
+    ( cam "Flughafen Stuttgart 2" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam5.jpg )
+    ( cam "Flughafen Stuttgart 3" http://webcam.flughafen-stuttgart.de/Flughafen_Stuttgart_Webcam7.jpg )
+    ( cam "S21 1" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-03/s21-turm03.jpg )
+    ( cam "S21 2" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-02/s21-turm-02.jpg )
+    ( cam "S21 3" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Turm-01/s21-turm-01.jpg )
+    ( cam "S21 4" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Jaegerstrasse-Nordkopf/s21-jaegerstrassse-nordkopf.jpg )
+    ( cam "S21 5" http://webcam-bahnprojekt-stuttgart-ulm.de/S21-Bahndirektion-Nord/S21-Bundesbahndirektion-Nord.jpg )
+  ];
+}
diff --git a/makefu/2configs/bureautomation/camera/verkehrskamera.nix b/makefu/2configs/bureautomation/camera/verkehrskamera.nix
index f2dfdcd91..f09dc9423 100644
--- a/makefu/2configs/bureautomation/camera/verkehrskamera.nix
+++ b/makefu/2configs/bureautomation/camera/verkehrskamera.nix
@@ -1,14 +1,17 @@
-[
-  { name = "Baumarkt";
-    platform = "generic";
-    still_image_url = http://t4915209254324-p80-c0-h6jv2afnujcoftrcstsafb45kdrqv4buy.webdirect.mdex.de/oneshotimage ;# baumarkt
-  }
-  { name = "Autobahn Heilbronn";
-    platform = "generic";
-    still_image_url = https://api.svz-bw.de/v2/verkehrskameras/kameras/K10 ;
-  }
-  { name = "Autobahn Singen";
-    platform = "generic";
-    still_image_url = https://api.svz-bw.de/v2/verkehrskameras/kameras/K11 ;
-  }
-]
+{
+  services.home-assistant.config.camera =
+  [
+    { name = "Baumarkt";
+      platform = "generic";
+      still_image_url = http://t4915209254324-p80-c0-h6jv2afnujcoftrcstsafb45kdrqv4buy.webdirect.mdex.de/oneshotimage ;# baumarkt
+    }
+    { name = "Autobahn Heilbronn";
+      platform = "generic";
+      still_image_url = https://api.svz-bw.de/v2/verkehrskameras/kameras/K10 ;
+    }
+    { name = "Autobahn Singen";
+      platform = "generic";
+      still_image_url = https://api.svz-bw.de/v2/verkehrskameras/kameras/K11 ;
+    }
+  ];
+}
diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix
index cd598f0aa..7e8b6a4d3 100644
--- a/makefu/2configs/bureautomation/default.nix
+++ b/makefu/2configs/bureautomation/default.nix
@@ -1,20 +1,51 @@
 { config, pkgs, lib, ... }:
 let
   kodi-host = "192.168.8.11";
-  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
-  frosch = import ./multi/frosch.nix { inherit lib; }; # provides: sensor binary_sensor switch light script automation
-  aramark = import ./multi/aramark.nix { inherit lib; }; # provides: sensor binary_sensor
-  standup = import ./multi/daily-standup.nix { inherit lib; }; # provides: automation script
 in {
   imports = [
     ./ota.nix
     ./comic-updater.nix
     ./puppy-proxy.nix
+
+    # hass config
+    ## complex configs
+    ./multi/daily-standup.nix
+    ./multi/aramark.nix
+    ./multi/matrix.nix
+    ./multi/frosch.nix
+    ./multi/mittagessen.nix
+    ./multi/10h_timers.nix
+
+    ./switch/tasmota_switch.nix
+    ./switch/rfbridge.nix
+
+    ./light/statuslight.nix
+    ./light/buzzer.nix
+
+    ./script/multi_blink.nix
+
+    ./binary_sensor/buttons.nix
+    ./binary_sensor/motion.nix
+
+    # ./sensor/pollen.nix requires dwd_pollen
+    ./sensor/espeasy.nix
+    ./sensor/airquality.nix
+    ./sensor/outside.nix
+    ./sensor/tasmota_firmware.nix
+
+    ./camera/verkehrskamera.nix
+    ./camera/comic.nix
+    ./camera/stuttgart.nix
+    ./automation/bureau-shutdown.nix
+    ./automation/nachtlicht.nix
+    ./automation/schlechteluft.nix
+    ./automation/hass-restart.nix
+    ./device_tracker/openwrt.nix
+    ./person/team.nix
   ];
   networking.firewall.allowedTCPPorts = [ 8123 ];
   state = [ "/var/lib/hass/known_devices.yaml" ];
+
   services.home-assistant = {
     enable = true;
     autoExtraComponents = true;
@@ -51,7 +82,6 @@ in {
           source = "hass";
         };
       };
-      matrix = matrix.matrix;
       mqtt = {
         discovery = true;
         discovery_prefix = "homeassistant";
@@ -73,13 +103,6 @@ in {
           retain = true;
         };
       };
-      switch = (import ./switch/tasmota_switch.nix)
-               ++ frosch.switch
-               ++ (import ./switch/rfbridge.nix);
-      light = (import ./light/statuslight.nix)
-              ++ (import ./light/buzzer.nix)
-              ++ frosch.light;
-      timer = ten_hours.timer;
       notify = [
         {
           platform = "kodi";
@@ -93,7 +116,7 @@ in {
             (builtins.fromJSON (builtins.readFile
               <secrets/hass/telegram-bot.json>)).allowed_chat_ids 0;
         }
-      ] ++ matrix.notify;
+      ];
       media_player = [
         { platform = "kodi";
           host = kodi-host;
@@ -102,37 +125,10 @@ in {
           host = "127.0.0.1";
         }
       ];
-      script = lib.fold lib.recursiveUpdate {} [
-        ((import ./script/multi_blink.nix) {inherit lib;})
-        frosch.script
-        ten_hours.script
-        mittagessen.script
-        # standup.script
-      ];
-      binary_sensor =
-        (import ./binary_sensor/buttons.nix)
-        ++ (import ./binary_sensor/motion.nix)
-        ++ frosch.binary_sensor
-        ++ aramark.binary_sensor;
 
-      sensor = []
-        ++ [{ platform = "version"; }] # pyhaversion
-        # ++ (import ./sensor/pollen.nix)
-        ++ (import ./sensor/espeasy.nix)
-        ++ (import ./sensor/airquality.nix)
-        ++ ((import ./sensor/outside.nix) {inherit lib;})
-        ++ (import ./sensor/influxdb.nix)
-        ++ (import ./sensor/tasmota_firmware.nix)
-        ++ frosch.sensor
-        ++ aramark.sensor;
+      sensor = [{ platform = "version"; }]; # pyhaversion
 
-      camera =
-         (import ./camera/verkehrskamera.nix)
-         ++ (import ./camera/comic.nix)
-         ++ (import ./camera/stuttgart.nix);
 
-      person =
-        (import ./person/team.nix );
 
       frontend = { };
       http = {
@@ -263,16 +259,6 @@ in {
       # feedreader.urls = [ "http://www.heise.de/security/rss/news-atom.xml" ];
       # we don't use imports because the expressions do not merge in
       # home-assistant
-      automation = (import ./automation/bureau-shutdown.nix)
-                  ++ (import ./automation/nachtlicht.nix)
-                  ++ (import ./automation/schlechteluft.nix)
-                  ++ (import ./automation/hass-restart.nix)
-                  ++ ten_hours.automation
-                  ++ matrix.automation
-                  # ++ standup.automation
-                  ++ frosch.automation
-                  ++ mittagessen.automation;
-      device_tracker = (import ./device_tracker/openwrt.nix );
     };
   };
 }
diff --git a/makefu/2configs/bureautomation/device_tracker/openwrt.nix b/makefu/2configs/bureautomation/device_tracker/openwrt.nix
index 5de216474..6b0144129 100644
--- a/makefu/2configs/bureautomation/device_tracker/openwrt.nix
+++ b/makefu/2configs/bureautomation/device_tracker/openwrt.nix
@@ -1,16 +1,19 @@
 # requires `opkg install luci-mod-rpc` on router
 # see https://www.home-assistant.io/components/luci/
 
-[
-  { platform = "luci";
-    host = "192.168.8.1";
-    username = "root";
-    password = import <secrets/hass/router.nix>;
-    interval_seconds = 30; # instead of 12seconds
-    consider_home = 300; # 5 minutes timeout
-    new_device_defaults = {
-      track_new_devices = true;
-      hide_if_away = false;
-    };
-  }
-]
+{
+  services.home-assistant.config.device_tracker =
+  [
+    { platform = "luci";
+      host = "192.168.8.1";
+      username = "root";
+      passwor