From 6812dc19447ff8c6845712f7be7046b6e833e93b Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 11 Jan 2026 21:29:44 +0100
Subject: ci: fix relative path to lib/pure.nix

The ci module is in a subdirectory (krebs/3modules/ci/), so it needs
an extra ../ to reach lib/pure.nix.
---
 krebs/3modules/ci/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/ci/default.nix b/krebs/3modules/ci/default.nix
index 899db45c5..1f029276a 100644
--- a/krebs/3modules/ci/default.nix
+++ b/krebs/3modules/ci/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
-with lib.slib or (import ../../lib/pure.nix { inherit lib; });
+with lib.slib or (import ../../../lib/pure.nix { inherit lib; });
 
 let
   cfg = config.krebs.ci;
-- 
cgit v1.2.3


From 9f96921ede1131fe18556c239dd7d2215b0b1137 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 11 Jan 2026 21:30:05 +0100
Subject: tinc: filter hosts without valid tinc config

Hosts that have a network entry but no tinc.config (like 'ne' which
only has aliases) should be excluded from the hosts package generation.
---
 krebs/3modules/tinc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index debbb184b..02b3eeb9d 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -91,7 +91,7 @@ with lib.slib or (import ../../lib/pure.nix { inherit lib; }); {
         hosts = mkOption {
           type = with types; attrsOf host;
           default =
-            filterAttrs (_: h: hasAttr tinc.config.netname h.nets) config.krebs.hosts;
+            filterAttrs (_: h: hasAttr tinc.config.netname h.nets && h.nets.${tinc.config.netname}.tinc.config or null != null) config.krebs.hosts;
           defaultText = "‹all-hosts-of-‹netname››";
           description = ''
             Hosts to generate <literal>config.krebs.tinc.retiolum.hostsPackage</literal>.
-- 
cgit v1.2.3