Merge pull request #47 from arcnmx/hass-misc-fixes

misc hass fixes
This commit is contained in:
Kat Inskip 2022-10-07 09:35:57 -07:00 committed by GitHub
commit 2c6a7c7e6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -66,8 +66,8 @@ in {
preStart = lib.mkBefore '' preStart = lib.mkBefore ''
cp --no-preserve=mode ${config.secrets.files.home-assistant-secrets.path} ${config.services.home-assistant.configDir}/secrets.yaml cp --no-preserve=mode ${config.secrets.files.home-assistant-secrets.path} ${config.services.home-assistant.configDir}/secrets.yaml
cp --no-preserve=mode ${config.secrets.files.ha-integration.path} ${config.services.home-assistant.configDir}/integration.yaml cp --no-preserve=mode ${config.secrets.files.ha-integration.path} ${config.services.home-assistant.configDir}/integration.yaml
touch ${config.services.home-assistant.configDir}/automations.yaml # UI-editable config files
touch ${config.services.home-assistant.configDir}/scenes.yaml touch ${config.services.home-assistant.configDir}/{automations,scenes,scripts}.yaml
''; '';
}; };
@ -138,6 +138,7 @@ in {
report_state = true; report_state = true;
exposed_domains = [ exposed_domains = [
"scene" "scene"
"script"
"climate" "climate"
#"sensor" #"sensor"
]; ];
@ -183,9 +184,14 @@ in {
ip_address = "10.1.1.38"; ip_address = "10.1.1.38";
filter = let filter = let
inherit (config.services.home-assistant.config) google_assistant; inherit (config.services.home-assistant.config) google_assistant;
entities = filterAttrs (_: entity: entity.expose or true) google_assistant.entity_config;
in { in {
include_domains = google_assistant.exposed_domains; include_domains = google_assistant.exposed_domains;
include_entities = attrNames (filterAttrs (_: entity: entity.expose or true) google_assistant.entity_config); include_entities = attrNames (removeAttrs entities [
# HomeKit is able to group lights together, no need to use the google hack here
"light.living_cluster"
"light.bedroom_overhead"
]);
}; };
entity_config = { entity_config = {
"switch.swb1_relay_3".type = "outlet"; "switch.swb1_relay_3".type = "outlet";
@ -202,6 +208,8 @@ in {
# https://nixos.wiki/wiki/Home_Assistant#Combine_declarative_and_UI_defined_scenes # https://nixos.wiki/wiki/Home_Assistant#Combine_declarative_and_UI_defined_scenes
"scene manual" = []; "scene manual" = [];
"scene ui" = "!include scenes.yaml"; "scene ui" = "!include scenes.yaml";
"script manual" = [];
"script ui" = "!include scripts.yaml";
counter = {}; counter = {};
device_tracker = {}; device_tracker = {};
energy = {}; energy = {};
@ -209,17 +217,18 @@ in {
history = {}; history = {};
image = {}; image = {};
input_boolean = {}; input_boolean = {};
input_button = {};
input_datetime = {}; input_datetime = {};
input_number = {}; input_number = {};
input_select = {}; input_select = {};
input_text = {}; input_text = {};
logbook = {}; logbook = {};
schedule = {};
map = {}; map = {};
media_source = {}; media_source = {};
mobile_app = {}; mobile_app = {};
my = {}; my = {};
person = {}; person = {};
script = {};
ssdp = {}; ssdp = {};
switch = {}; switch = {};
stream = {}; stream = {};
@ -248,6 +257,10 @@ in {
device_id = "name:galaxy-watch-active"; device_id = "name:galaxy-watch-active";
name = "Galaxy Watch Active"; name = "Galaxy Watch Active";
}) })
(mkESPresenceBeacon {
device_id = "3003c8383b6c";
name = "Nue";
})
]; ];
}; };
extraPackages = python3Packages: with python3Packages; [ extraPackages = python3Packages: with python3Packages; [
@ -260,6 +273,7 @@ in {
extraComponents = [ extraComponents = [
"automation" "automation"
"scene" "scene"
"script"
"zha" "zha"
"esphome" "esphome"
"apple_tv" "apple_tv"