From 663dbfb82d631c8fcc4b6c46a4db3760a99e1c36 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sun, 3 Dec 2023 00:52:54 +0100 Subject: nixos/home-assistant: fix custom lovelace module loading based on https://community.home-assistant.io/t/ui-lovelace-yaml-and-custom-resources/240178/4 Tested on a home-assistant server and before the card was not loaded at all. After this it threw an error that my config is wrong. --- nixos/modules/services/home-automation/home-assistant.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 54fd3e17292f6..e1fe1d9f54cb1 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -11,14 +11,12 @@ let # options shown in settings. # We post-process the result to add support for YAML functions, like secrets or includes, see e.g. # https://www.home-assistant.io/docs/configuration/secrets/ - filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) cfg.config or {}; + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) (lib.recursiveUpdate customLovelaceModulesResources (cfg.config or {})); configFile = pkgs.runCommandLocal "configuration.yaml" { } '' cp ${format.generate "configuration.yaml" filteredConfig} $out sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out ''; - lovelaceConfig = if (cfg.lovelaceConfig == null) then {} - else (lib.recursiveUpdate customLovelaceModulesResources cfg.lovelaceConfig); - lovelaceConfigFile = format.generate "ui-lovelace.yaml" lovelaceConfig; + lovelaceConfigFile = format.generate "ui-lovelace.yaml" cfg.lovelaceConfig; # Components advertised by the home-assistant package availableComponents = cfg.package.availableComponents; -- cgit 1.4.1