2 files changed, 3 insertions, 52 deletions
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index 1a65ba62c..de9fa6be7 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -12,7 +12,6 @@ let
   zigbee = import ./multi/zigbee2mqtt.nix;
   flurlicht = import ./multi/flurlicht.nix;
   kurzzeitwecker = import ./multi/kurzzeitwecker.nix;
-  esphome = import ./multi/esphome.nix;
 #   switch
 #   automation
 #   binary_sensor
@@ -34,7 +33,7 @@ in {
         longitude = "9.2478";
         elevation = 247;
       };
-      #discovery = {};
+      discovery = {};
       conversation = {};
       history = {};
       logbook = {};
@@ -110,7 +109,6 @@ in {
       };
       binary_sensor =
          zigbee.binary_sensor
-      ++ esphome.binary_sensor
       ++ flurlicht.binary_sensor;
       sensor = [
         { platform = "speedtest";
@@ -119,10 +117,9 @@ in {
         # https://www.home-assistant.io/cookbook/automation_for_rainy_days/
       ]
       ++ ((import ./sensor/outside.nix) {inherit lib;})
-      ++ esphome.sensor
       ++ zigbee.sensor ;
       frontend = { };
-      light = flurlicht.light ++ esphome.light;
+      light = flurlicht.light;
       group =
         { default_view =
           { view = "yes";
@@ -166,8 +163,7 @@ in {
         };
       http = { };
       switch =
-         esphome.switch
-      ++ zigbee.switch;
+         zigbee.switch;
       automation =
          flurlicht.automation
       ++ kurzzeitwecker.automation
diff --git a/makefu/2configs/ham/multi/esphome.nix b/makefu/2configs/ham/multi/esphome.nix
deleted file mode 100644
index 8ca12d899..000000000
--- a/makefu/2configs/ham/multi/esphome.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# provides:
-#   switch
-#   automation
-#   binary_sensor
-#   sensor
-#   input_select
-#   timer
-let
-  inherit (import ../lib) esphome;
-  sonoff_s20 = host: {
-    sensor = [
-      (esphome.ip { inherit host;})
-      (esphome.wifi { inherit host;})
-      (esphome.temp { inherit host;})
-      (esphome.hum { inherit host;})
-    ];
-    binary_sensor = [
-      (esphome.btn { inherit host;})
-    ];
-    light = [
-      (esphome.monoled { inherit host;})
-    ];
-    switch = [
-      (esphome.relay { inherit host;})
-      (esphome.restart { inherit host;})
-    ];
-  };
-  dusche = sonoff_s20 "dusche_plug";
-  schlafzimmer = sonoff_s20 "schlafzimmer_plug";
-in {
-  sensor = [
-    (esphome.pressure {host = "dusche_plug";})
-  ]
-  ++ dusche.sensor
-  ++ schlafzimmer.sensor;
-  binary_sensor =
-     dusche.binary_sensor
-  ++ schlafzimmer.binary_sensor;
-  light =
-     dusche.light
-  ++ schlafzimmer.light;
-  switch =
-     dusche.switch
-  ++ schlafzimmer.switch;
-}