From e008a493e0fc0d0418fdc703535e473d6f089d04 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:50:37 +0100
Subject: tv: hostDefaults -> evalHost

---
 krebs/3modules/tv/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index e096118c6..132a3c4be 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -1,11 +1,13 @@
 with import <stockholm/lib>;
 { config, ... }: let
 
-  hostDefaults = hostName: host: foldl' recursiveUpdate {} [
+  evalHost = hostName: hostConfig: evalSubmodule types.host [
+    hostConfig
     {
+      name = hostName;
       owner = config.krebs.users.tv;
     }
-    (optionalAttrs (host.nets?retiolum) {
+    (optionalAttrs (hostConfig.nets?retiolum) {
       nets.retiolum = {
         ip6.addr =
           (krebs.genipv6 "retiolum" "tv" { inherit hostName; }).address;
@@ -23,14 +25,13 @@ with import <stockholm/lib>;
         wireguard.pubkey = readFile pubkey-path;
       };
     })
-    host
   ];
 
 in {
   dns.providers = {
     "viljetic.de" = "regfish";
   };
-  hosts = mapAttrs hostDefaults {
+  hosts = mapAttrs evalHost {
     alnus = {
       ci = true;
       cores = 2;
-- 
cgit v1.2.3