diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-24 00:12:19 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-24 20:49:16 +0200 |
| commit | e4a6e320bb8f2adb79a3c9b83478da753de4eedb (patch) | |
| tree | 9614c0d7ac611f4d8d7b459476405c82f8853fd3 /nixos | |
| parent | b886faa6b60eb67bc9c09484673998924083c12b (diff) | |
| download | nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar.gz nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar.bz2 nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar.lz nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar.xz nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.tar.zst nixpkgs-e4a6e320bb8f2adb79a3c9b83478da753de4eedb.zip | |
home-assistant: simplify definition of configFile
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/home-assistant.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index b9a97296779..1dc7b44ee37 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,9 +5,10 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig - then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config)) - else cfg.config)); + # cfg.config != null can be assumed here + configFile = pkgs.writeText "configuration.json" + (builtins.toJSON (if cfg.applyDefaultConfig then + (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; |