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

5 files changed, 35 insertions, 35 deletions

diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index 66d430cd1..78379ba1c 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -26,7 +26,7 @@ with import ./lib.nix { inherit lib; };
     lovelaceConfigWritable = true;
   };
 
-  lass.hass.config = let
+  services.home-assistant.config = let
     tasmota_s20 = name: topic: {
       platform = "mqtt";
       inherit name;
diff --git a/lass/2configs/hass/rooms/bett.nix b/lass/2configs/hass/rooms/bett.nix
index 16227fcb6..48a1f72d7 100644
--- a/lass/2configs/hass/rooms/bett.nix
+++ b/lass/2configs/hass/rooms/bett.nix
@@ -2,38 +2,38 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (lightswitch switches.dimmer.bett lights.bett)
   ];
 
-  lass.hass.love = {
-    resources = [{
-      url = "https://raw.githubusercontent.com/ljmerza/light-entity-card/master/dist/light-entity-card.js.map";
-      type = "js";
-    }];
-    views = [{
-      title = "bett";
-      cards = [
-        {
-          type = "markdown";
-          title = "hello world";
-          content = "This is just a test";
-        }
-        {
-          type = "light";
-          entity = "light.${lights.bett}";
-        }
-        {
-          type = "custom:light-entity-card";
-          entity = "light.${lights.bett}";
-        }
-        {
-          type = "history-graph";
-          entities = [
-            "light.${lights.bett}"
-          ];
-        }
-      ];
-    }];
-  };
+  # lass.hass.love = {
+  #   resources = [{
+  #     url = "https://raw.githubusercontent.com/ljmerza/light-entity-card/master/dist/light-entity-card.js.map";
+  #     type = "js";
+  #   }];
+  #   views = [{
+  #     title = "bett";
+  #     cards = [
+  #       {
+  #         type = "markdown";
+  #         title = "hello world";
+  #         content = "This is just a test";
+  #       }
+  #       {
+  #         type = "light";
+  #         entity = "light.${lights.bett}";
+  #       }
+  #       {
+  #         type = "custom:light-entity-card";
+  #         entity = "light.${lights.bett}";
+  #       }
+  #       {
+  #         type = "history-graph";
+  #         entities = [
+  #           "light.${lights.bett}"
+  #         ];
+  #       }
+  #     ];
+  #   }];
+  # };
 }
diff --git a/lass/2configs/hass/rooms/essen.nix b/lass/2configs/hass/rooms/essen.nix
index f74996154..eeb3d30d2 100644
--- a/lass/2configs/hass/rooms/essen.nix
+++ b/lass/2configs/hass/rooms/essen.nix
@@ -2,7 +2,7 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (detect_movement sensors.movement.essen lights.essen 10)
     (lightswitch switches.dimmer.essen lights.essen)
   ];
diff --git a/lass/2configs/hass/rooms/nass.nix b/lass/2configs/hass/rooms/nass.nix
index 163f4fc48..7e6298738 100644
--- a/lass/2configs/hass/rooms/nass.nix
+++ b/lass/2configs/hass/rooms/nass.nix
@@ -2,7 +2,7 @@
 with import ../lib.nix { inherit lib; };
 
 {
-  lass.hass.config = lib.mkMerge [
+  services.home-assistant.config = lib.mkMerge [
     (detect_movement sensors.movement.nass lights.nass 100)
     (lightswitch switches.dimmer.nass lights.nass)
   ];
diff --git a/lass/2configs/hass/zigbee.nix b/lass/2configs/hass/zigbee.nix
index 6d091066e..b2a221e49 100644
--- a/lass/2configs/hass/zigbee.nix
+++ b/lass/2configs/hass/zigbee.nix
@@ -35,7 +35,7 @@ in {
     volumes = ["/var/lib/zigbee2mqtt:/app/data"];
   };
 
-  lass.hass.config = {
+  services.home-assistant.config = {
     sensor = [
       # Sensor for monitoring the bridge state
       {