remove deprecated hass module

8 files changed, 36 insertions, 87 deletions

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index babcb51de..81c813b97 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -222,4 +222,5 @@ with import <stockholm/lib>;
 
   # use 24:00 time format, the default got sneakily changed around 20.03
   i18n.defaultLocale = mkDefault "C.UTF-8";
+  system.stateVersion = lib.mkDefault "20.03";
 }
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
       {
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 335658ed8..c3c73bdcb 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -4,7 +4,6 @@ _:
     ./dnsmasq.nix
     ./ejabberd
     ./folderPerms.nix
-    ./hass.nix
     ./hosts.nix
     ./klem.nix
     ./mysql-backup.nix
diff --git a/lass/3modules/hass.nix b/lass/3modules/hass.nix
deleted file mode 100644
index 96521aaa9..000000000
--- a/lass/3modules/hass.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-let
-
-  cfg = config.lass.hass;
-
-in {
-  options.lass.hass = {
-    config = mkOption {
-      default = {};
-      type =  with lib.types; let
-          valueType = nullOr (oneOf [
-            bool
-            int
-            float
-            str
-            (attrsOf valueType)
-            (listOf valueType)
-          ]) // {
-            description = "Yaml value";
-            emptyValue.value = {};
-          };
-        in valueType;
-    };
-    love = mkOption {
-      default = {};
-      type =  with lib.types; let
-          valueType = nullOr (oneOf [
-            bool
-            int
-            float
-            str
-            (attrsOf valueType)
-            (listOf valueType)
-          ]) // {
-            description = "Yaml value";
-            emptyValue.value = {};
-          };
-        in valueType;
-    };
-  };
-
-  config =
-    assert versionOlder version "20.09";
-    mkIf (cfg.config != {})
-     {
-      services.home-assistant.config = cfg.config;
-      # services.home-assistant.lovelaceConfig = cfg.love;
-    };
-}
-