From a1e7e8b305b65c8493fc923965d56da8715ac0bf Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 7 Jun 2024 09:42:26 +0200
Subject: [PATCH] tinc refactoring

---
 nixos/components/network/tinc/default.nix  | 6 +++---
 nixos/components/network/tinc/private.nix  | 4 ++--
 nixos/machines/orbi/service-taskserver.nix | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/components/network/tinc/default.nix b/nixos/components/network/tinc/default.nix
index abe5aba..528c58a 100644
--- a/nixos/components/network/tinc/default.nix
+++ b/nixos/components/network/tinc/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, factsGenerator, ... }:
+{ lib, config, factsGenerator, clanLib, ... }:
 with lib;
 {
 
@@ -24,13 +24,13 @@ with lib;
       ipv4 = config.tinc.private.ipv4;
       ipv6 = null;
       inherit (lib) optionalString concatStringsSep mapAttrsToList;
-      inherit config factsGenerator;
+      inherit config factsGenerator clanLib;
     }))
     (mkIf config.tinc.secret.enable (import ./secret.nix {
       ipv4 = config.tinc.secret.ipv4;
       ipv6 = null;
       inherit (lib) optionalString concatStringsSep mapAttrsToList;
-      inherit config factsGenerator;
+      inherit config factsGenerator clanLib;
     }))
   ];
 }
diff --git a/nixos/components/network/tinc/private.nix b/nixos/components/network/tinc/private.nix
index 9e5e9b0..9a36725 100644
--- a/nixos/components/network/tinc/private.nix
+++ b/nixos/components/network/tinc/private.nix
@@ -5,6 +5,7 @@
 , concatStringsSep
 , factsGenerator
 , mapAttrsToList
+, clanLib
 , ...
 }:
 let
@@ -55,8 +56,7 @@ let
     "paperless.chungus" = hosts.chungus;
   };
   network = "private";
-  Ed25519PublicKey = machine: (builtins.readFile "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub");
-  Ed25519PublicKeyFile = machine: "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub";
+  Ed25519PublicKey = clanLib.readFact "tinc.private.ed25519_key.pub";
 in
 {
   networking.firewall.trustedInterfaces = [ "tinc.${network}" ];
diff --git a/nixos/machines/orbi/service-taskserver.nix b/nixos/machines/orbi/service-taskserver.nix
index d156ae2..01ba735 100644
--- a/nixos/machines/orbi/service-taskserver.nix
+++ b/nixos/machines/orbi/service-taskserver.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, factsGenerator, ... }: {
+{ config, lib, pkgs, ... }: {
 
   # todo: backup taskserver via zfs syncoid
   services.taskserver = {