Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove deprecated hass module

Browse Source
This commit is contained in:
lassulus 2020-11-19 18:49:04 +01:00
parent 7f11cf509f
commit 98de93f009
8 changed files with 36 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lass/2configs/default.nix
View File

@ -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";
}

2
lass/2configs/hass/default.nix
View File

@ -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;

62
lass/2configs/hass/rooms/bett.nix
View File

@ -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}"
# ];
# }
# ];
# }];
# };
}

2
lass/2configs/hass/rooms/essen.nix
View File

@ -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)
];

2
lass/2configs/hass/rooms/nass.nix
View File

@ -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)
];

2
lass/2configs/hass/zigbee.nix
View File

@ -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
{

1
lass/3modules/default.nix
View File

@ -4,7 +4,6 @@ _:
./dnsmasq.nix
./ejabberd
./folderPerms.nix
./hass.nix
./hosts.nix
./klem.nix
./mysql-backup.nix

51
lass/3modules/hass.nix
View File

@ -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;
};
}