Merge remote-tracking branch 'prism/master' into master

4 files changed, 236 insertions, 353 deletions

diff --git a/makefu/2configs/ham/multi/fliegen-couter.nix b/makefu/2configs/ham/multi/fliegen-couter.nix
index d5c180e03..5b8abb2ff 100644
--- a/makefu/2configs/ham/multi/fliegen-couter.nix
+++ b/makefu/2configs/ham/multi/fliegen-couter.nix
@@ -15,53 +15,57 @@ let
       data.entity_id = "counter.${for}_fliegen";
     }) incr;
   };
-in {
-  counter = {
-    felix_fliegen = {};
-    misa_fliegen = {};
+in
+{
+  services.home-assistant.config =
+  {
+    counter = {
+      felix_fliegen = {};
+      misa_fliegen = {};
+    };
+    automation = [
+      (fly_swat "misa"  "btn1" "single" 1)
+      (fly_swat "misa"  "btn1" "double" 2)
+      (fly_swat "misa"  "btn1" "triple" 3)
+      (fly_swat "felix"  "btn2" "single" 1)
+      (fly_swat "felix"  "btn2" "double" 2)
+      (fly_swat "felix"  "btn2" "triple" 3)
+      {
+        alias = "Send Fly Counter Update";
+        trigger = [
+          {
+            platform = "state";
+            entity_id = "counter.felix_fliegen";
+          }
+          {
+            platform = "state";
+            entity_id = "counter.misa_fliegen";
+            #above = -1;
+          }
+        ];
+        action = {
+            service = "mqtt.publish";
+            data_template = { # gauge-style
+              payload = "{{ trigger.to_state.state }}";
+              topic = "${hlib.prefix}/flycounter/{{ trigger.to_state.object_id }}";
+            };
+        };
+      }
+      {
+        alias = "Reset Fly counters on midnight";
+        trigger = {
+          platform = "time";
+          at = "01:00:00";
+        };
+        action = [
+          { service = "counter.reset";
+            data.entity_id = "counter.misa_fliegen";
+          }
+          { service = "counter.reset";
+            data.entity_id = "counter.felix_fliegen";
+          }
+        ];
+      }
+    ];
   };
-  automation = [
-    (fly_swat "misa"  "btn1" "single" 1)
-    (fly_swat "misa"  "btn1" "double" 2)
-    (fly_swat "misa"  "btn1" "triple" 3)
-    (fly_swat "felix"  "btn2" "single" 1)
-    (fly_swat "felix"  "btn2" "double" 2)
-    (fly_swat "felix"  "btn2" "triple" 3)
-    {
-      alias = "Send Fly Counter Update";
-      trigger = [
-        {
-          platform = "state";
-          entity_id = "counter.felix_fliegen";
-        }
-        {
-          platform = "state";
-          entity_id = "counter.misa_fliegen";
-          #above = -1;
-        }
-      ];
-      action = {
-          service = "mqtt.publish";
-          data_template = { # gauge-style
-            payload = "{{ trigger.to_state.state }}";
-            topic = "${hlib.prefix}/flycounter/{{ trigger.to_state.object_id }}";
-          };
-      };
-    }
-    {
-      alias = "Reset Fly counters on midnight";
-      trigger = {
-        platform = "time";
-        at = "01:00:00";
-      };
-      action = [
-        { service = "counter.reset";
-          data.entity_id = "counter.misa_fliegen";
-        }
-        { service = "counter.reset";
-          data.entity_id = "counter.felix_fliegen";
-        }
-      ];
-    }
-  ];
 }
diff --git a/makefu/2configs/ham/multi/kurzzeitwecker.nix b/makefu/2configs/ham/multi/kurzzeitwecker.nix
index 03d0d5aac..bd81465cb 100644
--- a/makefu/2configs/ham/multi/kurzzeitwecker.nix
+++ b/makefu/2configs/ham/multi/kurzzeitwecker.nix
@@ -8,125 +8,128 @@
 #  notify.telegrambot
 let
   button = "sensor.zigbee_btn2_click";
-in {
-  timer.kurzzeitwecker =
-  {
-    name = "Zigbee Kurzzeitwecker";
-    duration = 300;
-  };
-    script.add_5_minutes_to_kurzzeitwecker =
-    {
-        alias = "Add 5 minutes to kurzzeitwecker";
-        sequence = [
-          { service = "timer.pause";
-          entity_id = "timer.kurzzeitwecker";
-        }
-        { service = "timer.start";
-          data_template = {
-            entity_id = "timer.kurzzeitwecker";
-            duration = ''
-              {% set r = state_attr('timer.kurzzeitwecker', 'remaining') ~ '-0000' %}
-              {% set t = strptime(r, '%H:%M:%S.%f%z') %}
-              {{ (as_timestamp(t) + 300) | timestamp_custom('%H:%M:%S', false) }}
-            '';
-        };
-      }
-    ];
-  };
-  automation =
-  [
+in
+{
+  services.home-assistant.config = {
+    timer.kurzzeitwecker =
     {
-      alias = "Start Timer 5min";
-      trigger = {
-        platform = "state";
-        entity_id = button;
-        to =  "single";
-      };
-      condition =
-          { condition = "state";
-            entity_id = "timer.kurzzeitwecker";
-            state =  "idle";
-          };
-
-      action = [
-        { service = "timer.start";
-          entity_id =  "timer.kurzzeitwecker";
-          data.duration = "00:05:00";
-        }
-        {
-          service = "notify.telegrambot";
-          data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend ";
-        }
-      ];
-    }
-    {
-      alias = "Add Timer 5min";
-      trigger = {
-        platform = "state";
-        entity_id = button;
-        to =  "single";
-      };
-      condition =
-          { condition = "state";
+      name = "Zigbee Kurzzeitwecker";
+      duration = 300;
+    };
+      script.add_5_minutes_to_kurzzeitwecker =
+      {
+          alias = "Add 5 minutes to kurzzeitwecker";
+          sequence = [
+            { service = "timer.pause";
             entity_id = "timer.kurzzeitwecker";
-            state =  "active";
+          }
+          { service = "timer.start";
+            data_template = {
+              entity_id = "timer.kurzzeitwecker";
+              duration = ''
+                {% set r = state_attr('timer.kurzzeitwecker', 'remaining') ~ '-0000' %}
+                {% set t = strptime(r, '%H:%M:%S.%f%z') %}
+                {{ (as_timestamp(t) + 300) | timestamp_custom('%H:%M:%S', false) }}
+              '';
           };
-
-      action = [
-        { service = "homeassistant.turn_on";
-          entity_id =  "script.add_5_minutes_to_kurzzeitwecker";
-        }
-        {
-          service = "notify.telegrambot";
-          data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend '';
         }
       ];
-    }
-    {
-      alias = "Stop timer on double click";
-      trigger = [
-        {
+    };
+    automation =
+    [
+      {
+        alias = "Start Timer 5min";
+        trigger = {
           platform = "state";
           entity_id = button;
-          to =  "double";
-        }
-        {
+          to =  "single";
+        };
+        condition =
+            { condition = "state";
+              entity_id = "timer.kurzzeitwecker";
+              state =  "idle";
+            };
+
+        action = [
+          { service = "timer.start";
+            entity_id =  "timer.kurzzeitwecker";
+            data.duration = "00:05:00";
+          }
+          {
+            service = "notify.telegrambot";
+            data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend ";
+          }
+        ];
+      }
+      {
+        alias = "Add Timer 5min";
+        trigger = {
           platform = "state";
           entity_id = button;
-          to =  "triple";
-        }
-      ];
-      condition =
-      {
-        condition = "state";
-        entity_id = "timer.kurzzeitwecker";
-        state =  "active";
-      };
+          to =  "single";
+        };
+        condition =
+            { condition = "state";
+              entity_id = "timer.kurzzeitwecker";
+              state =  "active";
+            };
 
-      action = [
-        {
-          service = "timer.cancel";
-          entity_id =  "timer.kurzzeitwecker";
-        }
-        {
-          service = "notify.telegrambot";
-          data.message = "Timer gestoppt, abgebrochen";
-        }
-      ];
-    }
-    {
-      alias = "Timer Finished";
-      trigger = {
-        platform = "event";
-        event_type = "timer.finished";
-        event_data.entity_id = "timer.kurzzeitwecker";
-      };
-      action = [
+        action = [
+          { service = "homeassistant.turn_on";
+            entity_id =  "script.add_5_minutes_to_kurzzeitwecker";
+          }
+          {
+            service = "notify.telegrambot";
+            data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend '';
+          }
+        ];
+      }
+      {
+        alias = "Stop timer on double click";
+        trigger = [
+          {
+            platform = "state";
+            entity_id = button;
+            to =  "double";
+          }
+          {
+            platform = "state";
+            entity_id = button;
+            to =  "triple";
+          }
+        ];
+        condition =
         {
-          service = "notify.telegrambot";
-          data.message = "Timer beendet";
-        }
-      ];
-    }
-  ];
+          condition = "state";
+          entity_id = "timer.kurzzeitwecker";
+          state =  "active";
+        };
+
+        action = [
+          {
+            service = "timer.cancel";
+            entity_id =  "timer.kurzzeitwecker";
+          }
+          {
+            service = "notify.telegrambot";
+            data.message = "Timer gestoppt, abgebrochen";
+          }
+        ];
+      }
+      {
+        alias = "Timer Finished";
+        trigger = {
+          platform = "event";
+          event_type = "timer.finished";
+          event_data.entity_id = "timer.kurzzeitwecker";
+        };
+        action = [
+          {
+            service = "notify.telegrambot";
+            data.message = "Timer beendet";
+          }
+        ];
+      }
+    ];
+  };
 }
diff --git a/makefu/2configs/ham/multi/the_playlist.nix b/makefu/2configs/ham/multi/the_playlist.nix
index ad090938c..0d714ea44 100644
--- a/makefu/2configs/ham/multi/the_playlist.nix
+++ b/makefu/2configs/ham/multi/the_playlist.nix
@@ -7,77 +7,80 @@
 #  automation
 #  sensor
 {
-  rest_command = {
-    good_song = {
-      url = "http://prism.r:8001/good";
-      method = "POST";
-    };
-    bad_song = {
-      url = "http://prism.r:8001/skip";
-      method = "POST";
-    };
-  };
-  automation = [
-    {
-      alias = "playlist song publish";
-      trigger = {
-        #platform = "event";
-        #event_data.entity_id = "sensor.the_playlist_song";
-        platform = "state";
-        entity_id = "sensor.the_playlist_song";
-      };
-      action = {
-        service = "mqtt.publish";
-        data = {
-          topic = "/ham/the_playlist/song";
-          payload_template = "{{ states.sensor.the_playlist_song.state }}";
-        };
-      };
-    }
-    {
-      alias = "playlist upvote on button";
-      trigger = {
-        platform = "state";
-        entity_id = "binary_sensor.playlist_button_good";
-        from = "off";
-        to = "on";
+  services.home-assistant.config =
+  {
+    rest_command = {
+      good_song = {
+        url = "http://prism.r:8001/good";
+        method = "POST";
       };
-      action.service = "rest_command.good_song";
-    }
-    {
-      alias = "playlist downvote on button";
-      trigger = {
-        platform = "state";
-        entity_id = "binary_sensor.playlist_button_bad";
-        from = "off";
-        to = "on";
+      bad_song = {
+        url = "http://prism.r:8001/skip";
+        method = "POST";
       };
-      action.service = "rest_command.bad_song";
-    }
-  ];
-  sensor =  [
-    { platform = "rest";
-      name = "pl";
-      resource = "http://prism.r:8001/current";
-      scan_interval = 30;
-      value_template = "1";
-      json_attributes = [ "name" "filename" "youtube" ];
-    }
-    { platform = "template";
-      sensors = {
-        the_playlist_song = {
-          friendly_name = "Current Song";
-          value_template = ''{{ states.sensor.pl.attributes['name'] }}'';
+    };
+    automation = [
+      {
+        alias = "playlist song publish";
+        trigger = {
+          #platform = "event";
+          #event_data.entity_id = "sensor.the_playlist_song";
+          platform = "state";
+          entity_id = "sensor.the_playlist_song";
         };
-        the_playlist_url = {
-          friendly_name = "Song Youtube URL";
-          value_template = ''{{ states.sensor.pl.attributes['youtube'] }}'';
+        action = {
+          service = "mqtt.publish";
+          data = {
+            topic = "/ham/the_playlist/song";
+            payload_template = "{{ states.sensor.the_playlist_song.state }}";
+          };
         };
-        the_playlist_filename = {
-          friendly_name = "Song Filename";
-          value_template = ''{{ states.sensor.pl.attributes['filename'] }}'';
+      }
+      {
+        alias = "playlist upvote on button";
+        trigger = {
+          platform = "state";
+          entity_id = "binary_sensor.playlist_button_good";
+          from = "off";
+          to = "on";
         };
-      };
-    }
-  ];
+        action.service = "rest_command.good_song";
+      }
+      {
+        alias = "playlist downvote on button";
+        trigger = {
+          platform = "state";
+          entity_id = "binary_sensor.playlist_button_bad";
+          from = "off";
+          to = "on";
+        };
+        action.service = "rest_command.bad_song";
+      }
+    ];
+    sensor =  [
+      { platform = "rest";
+        name = "pl";
+        resource = "http://prism.r:8001/current";
+        scan_interval = 30;
+        value_template = "1";
+        json_attributes = [ "name" "filename" "youtube" ];
+      }
+      { platform = "template";
+        sensors = {
+          the_playlist_song = {
+            friendly_name = "Current Song";
+            value_template = ''{{ states.sensor.pl.attributes['name'] }}'';
+          };
+          the_playlist_url = {
+            friendly_name = "Song Youtube URL";
+            value_template = ''{{ states.sensor.pl.attributes['youtube'] }}'';
+          };
+          the_playlist_filename = {
+            friendly_name = "Song Filename";
+            value_template = ''{{ states.sensor.pl.attributes['filename'] }}'';
+          };
+        };
+      }
+    ];
+  };
 }
diff --git a/makefu/2configs/ham/multi/zigbee2mqtt.nix b/makefu/2configs/ham/multi/zigbee2mqtt.nix
deleted file mode 100644
index 84f2cc9d3..000000000
--- a/makefu/2configs/ham/multi/zigbee2mqtt.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-# provides:
-#   switch
-#   automation
-#   binary_sensor
-#   sensor
-#   input_select
-#   timer
-let
-  inherit (import ../lib) zigbee;
-  prefix = zigbee.prefix;
-in {
-  sensor =
-
-     [
-    # Sensor for monitoring the bridge state
-    {
-      platform = "mqtt";
-      name = "Zigbee2mqtt Bridge state";
-      state_topic = "${prefix}/bridge/state";
-      icon = "mdi:router-wireless";
-    }
-    # Sensor for Showing the Zigbee2mqtt Version
-    {
-      platform = "mqtt";
-      name = "Zigbee2mqtt Version";
-      state_topic = "${prefix}/bridge/config";
-      value_template = "{{ value_json.version }}";
-      icon = "mdi:zigbee";
-    }
-    # Sensor for Showing the Coordinator Version
-    {
-      platform = "mqtt";
-      name = "Coordinator Version";
-      state_topic = "${prefix}/bridge/config";
-      value_template = "{{ value_json.coordinator }}";
-      icon = "mdi:chip";
-    }
-  ];
-  switch = [
-  {
-    platform = "mqtt";
-    name = "Zigbee2mqtt Main join";
-    state_topic = "${prefix}/bridge/config/permit_join";
-    command_topic = "${prefix}/bridge/config/permit_join";
-    payload_on = "true";
-    payload_off = "false";
-  }
-  ];
-  automation = [
-    {
-      alias = "Zigbee2mqtt Log Level";
-      initial_state = "on";
-      trigger = {
-        platform = "state";
-        entity_id = "input_select.zigbee2mqtt_log_level";
-      };
-      action = [
-        {
-          service =  "mqtt.publish";
-          data = {
-            payload_template = "{{ states('input_select.zigbee2mqtt_log_level') }}";
-            topic =  "${prefix}/bridge/config/log_level";
-          };
-        }
-      ];
-    }
-# Automation to start timer when enable join is turned on
-    {
-      id = "zigbee_join_enabled";
-      alias = "Zigbee Join Enabled";
-      trigger =
-      {
-        platform = "state";
-        entity_id = "switch.zigbee2mqtt_main_join";
-        to = "on";
-      };
-      action =
-      {
-        service = "timer.start";
-        entity_id = "timer.zigbee_permit_join";
-      };
-    }
-#  # Automation to stop timer when switch turned off and turn off switch when timer finished
-    {
-      id = "zigbee_join_disabled";
-      alias = "Zigbee Join Disabled";
-      trigger = [
-        {
-          platform = "event";
-          event_type = "timer.finished";
-          event_data.entity_id = "timer.zigbee_permit_join";
-        }
-        {
-          platform = "state";
-          entity_id = "switch.zigbee2mqtt_main_join";
-          to = "off";
-        }
-      ];
-      action = [
-        { service = "timer.cancel";
-          data.entity_id = "timer.zigbee_permit_join";
-        }
-        { service = "switch.turn_off";
-          entity_id = "switch.zigbee2mqtt_main_join";
-        }
-      ];
-    }
-  ];
-  input_select.zigbee2mqtt_log_level =
-  {
-    name = "Zigbee2mqtt Log Level";
-    options = [
-      "debug"
-      "info"
-      "warn"
-      "error"
-    ];
-    initial = "info";
-    icon = "mdi:format-list-bulleted";
-  };
-
-  timer.zigbee_permit_join =
-  {
-    name = "Zigbee Time remaining";
-    duration = 120;
-  };
-}