:Merge branch 'master' of prism.r:stockholm

1 files changed, 55 insertions, 260 deletions

diff --git a/makefu/2configs/bureautomation/hass.nix b/makefu/2configs/bureautomation/hass.nix
index b70c9b030..007d00b09 100644
--- a/makefu/2configs/bureautomation/hass.nix
+++ b/makefu/2configs/bureautomation/hass.nix
@@ -1,76 +1,5 @@
 { pkgs, lib, ... }:
 let
-  tasmota_rgb = name: topic:
-# LED WS2812b
-#      effect_state_topic: "stat/led/Scheme"
-#      effect_command_topic: "cmnd/led/Scheme"
-#      effect_value_template: "{{ value_json.Scheme }}"
-  { platform = "mqtt";
-    inherit name;
-    retain = false;
-    qos = 1;
-    optimistic = false;
-    # state
-    # TODO: currently broken, will not use the custom state topic
-    state_topic = "/bam/${topic}/stat/POWER";
-    command_topic = "/bam/${topic}/cmnd/POWER";
-    availability_topic = "/bam/${topic}/tele/LWT";
-    payload_on= "ON";
-    payload_off= "OFF";
-    payload_available= "Online";
-    payload_not_available= "Offline";
-    # brightness
-    brightness_state_topic = "/bam/${topic}/stat/Dimmer";
-    brightness_command_topic = "/bam/${topic}/cmnd/Dimmer";
-    brightness_value_template = "{{ value_json.Dimmer }}";
-    brightness_scale = 100;
-    # color
-    rgb_state_topic = "/bam/${topic}/stat/Color";
-    rgb_command_topic = "/bam/${topic}/cmnd/Color2";
-    rgb_command_mode = "hex";
-    rgb_command_template = "{{ '%02x%02x%02x' | format(red, green, blue)}}";
-    # effects
-    effect_state_topic = "/bam/${topic}/stat/Scheme";
-    effect_command_topic = "/bam/${topic}/cmnd/Scheme";
-    effect_value_template = "{{ value_json.Scheme }}";
-    effect_list = [ 0 1 2 3 4 5 6 7 8 9 10 11 12 ];
-};
-  tasmota_plug = name: topic:
-  { platform = "mqtt";
-    inherit name;
-    state_topic = "/bam/${topic}/stat/POWER";
-    command_topic = "/bam/${topic}/cmnd/POWER";
-    availability_topic = "/bam/${topic}/tele/LWT";
-    payload_on= "ON";
-    payload_off= "OFF";
-    payload_available= "Online";
-    payload_not_available= "Offline";
-  };
-  espeasy_dht22 = name: [
-  { platform = "mqtt";
-    name = "${name} DHT22 Temperature";
-    device_class = "temperature";
-    state_topic = "/bam/${name}/dht22/Temperature";
-    availability_topic = "/bam/${name}/tele/LWT";
-    payload_available = "Online";
-    payload_not_available = "Offline";
-  }
-  { platform = "mqtt";
-    device_class = "humidity";
-    name = "${name} DHT22 Humidity";
-    state_topic = "/bam/${name}/dht22/Humidity";
-    availability_topic = "/bam/${name}/tele/LWT";
-    payload_available = "Online";
-    payload_not_available = "Offline";
-  }];
-  espeasy_ds18 = name:
-  { platform = "mqtt";
-    name = "${name} DS18 Temperature";
-    state_topic = "/bam/${name}/ds18/Temperature";
-    availability_topic = "/bam/${name}/tele/LWT";
-    payload_available = "Online";
-    payload_not_available = "Offline";
-  };
 in {
   networking.firewall.allowedTCPPorts = [ 8123 ];
 
@@ -104,90 +33,43 @@ in {
           retain = true;
         };
       };
-      switch = [
-        (tasmota_plug "Bauarbeiterlampe" "plug")
-        (tasmota_plug "Blitzdings" "plug2")
-        (tasmota_plug "Fernseher" "plug3")
-        (tasmota_plug "Feuer" "plug4")
-        (tasmota_plug "Nachtlicht" "plug5")
-      ];
-      light = [
-        (tasmota_rgb "Status Felix" "status1")
-      ];
-      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";
+      switch = (import ./switch/tasmota_switch.nix);
+      light =  (import ./light/statuslight.nix) ++
+               (import ./light/buzzer.nix);
+      timer = {
+        felix_10h = {
+          name = "Felix 10h Timer";
+          duration = "10:00:00";
+        };
+        felix_8_30h = {
+          name = "Felix 8_30h Timer";
+          duration = "08:30:00";
+        };
+        felix_7h = {
+          name = "Felix 7h Timer";
+          duration = "07:00:00";
+        };
+      };
+      notify = [
+        {
+          platform = "kodi";
+          name = "wbob";
+          host = "192.168.8.11";
         }
       ];
+      script = (import ./script/multi_blink.nix) {inherit lib;};
+      binary_sensor =
+        (import ./binary_sensor/buttons.nix) ++
+        (import ./binary_sensor/motion.nix);
+
       sensor =
-          (espeasy_dht22 "easy1") ++
-          (espeasy_dht22 "easy2") ++
-        [ (espeasy_ds18 "easy3" )
-          { platform = "luftdaten";
-            name = "Ditzingen";
-            sensorid = "5341";
-            monitored_conditions = [ "P1" "P2" ];
-          }
+        (import ./sensor/espeasy.nix) ++
+        ((import ./sensor/outside.nix) {inherit lib;}) ++
+        (import ./sensor/influxdb.nix);
+
+      camera =
+        (import ./camera/verkehrskamera.nix);
 
-          { platform = "darksky";
-            api_key = lib.removeSuffix "\n"
-              (builtins.readFile <secrets/hass/darksky.apikey>);
-            language = "de";
-            monitored_conditions = [ "summary" "icon"
-            "nearest_storm_distance" "precip_probability"
-            "precip_intensity"
-            "temperature" # "temperature_high" "temperature_low"
-            "apparent_temperature"
-            "hourly_summary" # next 24 hours text
-            "humidity"
-            "pressure"
-            "uv_index" ];
-            units =  "si" ;
-            update_interval = {
-                  days = 0;
-                  hours = 0;
-                  minutes = 30;
-                  seconds = 0;
-            };
-          }
-          #{ platform = "influxdb";
-          #  queries = [
-          #    { name = "mean value of feinstaub P1";
-          #      where = '' "node" = 'esp8266-1355142' '';
-          #      measurement = "feinstaub";
-          #      database = "telegraf";
-          #      field = "P1";
-          #    }
-          #    { name = "mean value of feinstaub P2";
-          #      where = '' "node" = 'esp8266-1355142' '';
-          #      measurement = "feinstaub";
-          #      database = "telegraf";
-          #      field = "P2";
-          #    }
-          #  ];
-          #}
-        ];
-        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 ;
-          }
-        ];
       frontend = { };
       http = { };
       conversation = {};
@@ -203,13 +85,14 @@ in {
               "group.outside"
               "group.switches"
               "group.automation"
-              "group.camera"
+              # "group.camera"
             ];
           };
         automation = [
-          "automation.turn_off_fernseher_10_minutes_after_last_movement"
-          "automation.turn_off_nachtlicht_on_sunrise"
-          "automation.turn_on_nachtlicht_on_motion_and_dusk"
+          "timer.felix_10h"
+          "script.blitz_10s"
+          "script.buzz_red_led_fast"
+          "camera.Baumarkt"
         ];
         switches = [
           "switch.bauarbeiterlampe"
@@ -218,125 +101,37 @@ in {
           "switch.feuer"
           "switch.nachtlicht"
           "light.status_felix"
+          "light.status_daniel"
+          "light.buslicht"
+          "light.redbutton_buzzer"
         ];
-        camera = [
-          "camera.Baumarkt"
-          "camera.Autobahn_Heilbronn"
-          "camera.Autobahn_Singen"
-        ];
+
+        camera = [ ];
         sensors = [
           "binary_sensor.motion"
+          "binary_sensor.redbutton"
           "sensor.easy2_dht22_humidity"
           "sensor.easy2_dht22_temperature"
         ];
         outside = [
-          "sensor.ditzingen_pm10"
-          "sensor.ditzingen_pm25"
+          # "sensor.ditzingen_pm10"
+          # "sensor.ditzingen_pm25"
           "sensor.dark_sky_temperature"
           "sensor.dark_sky_humidity"
-          "sensor.dark_sky_pressure"
+          # "sensor.dark_sky_pressure"
           "sensor.dark_sky_hourly_summary"
-          "sensor.dark_sky_minutely_summary"
+          "camera.Autobahn_Heilbronn"
+          "camera.Autobahn_Singen"
         ];
       };
       # only for automation
       # feedreader.urls = [ "http://www.heise.de/security/rss/news-atom.xml" ];
-      automation = [
-        { alias = "Turn on Fernseher on movement";
-          trigger = {
-            platform = "state";
-            entity_id = "binary_sensor.motion";
-            to = "on";
-          };
-          action = {
-            service = "homeassistant.turn_on";
-            entity_id =  [
-              "switch.fernseher"
-              "switch.feuer"
-              "light.status_felix"
-            ];
-          };
-        }
-        {
-          alias = "Turn off Nachtlicht on sunrise";
-          trigger =
-          {
-            platform = "sun";
-            event = "sunrise";
-          };
-          action =
-          {
-            service = "homeassistant.turn_off";
-            entity_id =  [ "switch.nachtlicht" ];
-          };
-        }
-        {
-          alias = "Turn on Nachtlicht on motion and dusk";
-          trigger =
-          {
-            platform = "state";
-            entity_id = "binary_sensor.motion";
-            to = "on";
-          };
-          condition = # 'when dark'
-          {
-            condition = "or";
-            conditions = [
-              { condition = "sun";
-                after = "sunset";
-                after_offset = "-00:45:00"; # on dusk
-              }
-              { condition = "sun";
-                before = "sunrise";
-              }
-            ];
-          };
-          action =
-          {
-            service = "homeassistant.turn_on";
-            entity_id =  [ "switch.nachtlicht" ];
-          };
-        }
-        { alias = "Turn off Fernseher 10 minutes after last movement";
-          trigger = [
-          { # trigger when movement was detected at the time
-            platform = "state";
-            entity_id = "binary_sensor.motion";
-            to = "off";
-            for.minutes = 10;
-          }
-          { # trigger at 20: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"
-            ];
-          };
-          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" ];
-              }
-              {
-                condition = "state";
-                entity_id = "binary_sensor.motion";
-                state = "off";
-              }
-            ];
-          };
-        }
-      ];
+      # 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/10h_timer.nix);
+
     };
   };
 }