From 1f2cc94a0a5b0b0da77db6693e341eb67d572e7b Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Wed, 6 May 2026 23:39:28 +0200
Subject: [PATCH] Fix builder

---
 modules/server/containers/builder.nix        |  8 ++++++--
 modules/server/containers/default.nix        |  4 ++--
 modules/server/containers/defs/authentik.nix | 14 +++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/server/containers/builder.nix b/modules/server/containers/builder.nix
index 8c4d5c7..8b4e113 100644
--- a/modules/server/containers/builder.nix
+++ b/modules/server/containers/builder.nix
@@ -1,5 +1,6 @@
 { config, lib, serverCfg }:
-let builder =
+let 
+  builder =
   { image, secret ? ""
   , subdomain ? "", ip ? "", port ? 0
   , extraEnv ? { }, extraLabels ? { }
@@ -27,4 +28,7 @@ let builder =
     ] ++ lib.optional (ip != "") "--ip=${ip}";
   };
   in lib.recursiveUpdate base overrides;
-in builder // { host = "host.containers.internal"; }
\ No newline at end of file
+in {
+  mkContainer = builder;
+  host = "host.containers.internal"; 
+}
\ No newline at end of file
diff --git a/modules/server/containers/default.nix b/modules/server/containers/default.nix
index 147f4f3..0d5a299 100644
--- a/modules/server/containers/default.nix
+++ b/modules/server/containers/default.nix
@@ -1,10 +1,10 @@
 { config, pkgs, lib, ... }:
 let
   serverCfg = config.syscfg.server.containers;
-  mkContainer = import ./builder.nix { inherit config lib serverCfg; };
+  builder = import ./builder.nix { inherit config lib serverCfg; };
   enabledConfigs = lib.filterAttrs (name: c: c.enable) serverCfg;
   containerSetsList = lib.mapAttrsToList (name: containerCfg:
-  let defs = import (./defs + "/${name}.nix") {inherit config pkgs lib containerCfg mkContainer;};
+  let defs = import (./defs + "/${name}.nix") {inherit config pkgs lib containerCfg builder;};
   in{
     containers = lib.mapAttrs' (cName: cValue: 
       lib.nameValuePair "${name}-${cName}" cValue
diff --git a/modules/server/containers/defs/authentik.nix b/modules/server/containers/defs/authentik.nix
index 90bfa7d..89d23c8 100644
--- a/modules/server/containers/defs/authentik.nix
+++ b/modules/server/containers/defs/authentik.nix
@@ -1,4 +1,4 @@
-{ config, containerCfg, pkgs, lib, mkContainer, ... }:
+{ config, containerCfg, pkgs, lib, builder, ... }:
 let 
 serverCfg = config.syscfg.server;
 in {
@@ -14,15 +14,15 @@ in {
 
   containers = {
 
-    server = mkContainer {
+    server = builder.mkContainer {
       subdomain = "sso";
       image = "ghcr.io/goauthentik/server:latest";
       port = containerCfg.port;
       ip = containerCfg.ip;
       secret = "authentik";
       extraEnv = {
-        "AUTHENTIK_REDIS__HOST" = mkContainer.host;
-        "AUTHENTIK_POSTGRESQL__HOST" = mkContainer.host;
+        "AUTHENTIK_REDIS__HOST" = builder.host;
+        "AUTHENTIK_POSTGRESQL__HOST" = builder.host;
         "AUTHENTIK_POSTGRESQL__USER" = "authentik_user";
         "AUTHENTIK_POSTGRESQL__NAME" = "authentik_db";
         "AUTHENTIK_EMAIL__HOST" = serverCfg.mailDomain;
@@ -44,15 +44,15 @@ in {
       };
     };
 
-    worker = mkContainer {
+    worker = builder.mkContainer {
       subdomain = "sso";
       image = "ghcr.io/goauthentik/server:latest";
       port = containerCfg.port;
       ip = containerCfg.ip;
       secret = "authentik";
       extraEnv = {
-        "AUTHENTIK_REDIS__HOST" = mkContainer.host;
-        "AUTHENTIK_POSTGRESQL__HOST" = mkContainer.host;
+        "AUTHENTIK_REDIS__HOST" = builder.host;
+        "AUTHENTIK_POSTGRESQL__HOST" = builder.host;
         "AUTHENTIK_POSTGRESQL__USER" = "authentik_user";
         "AUTHENTIK_POSTGRESQL__NAME" = "authentik_db";
       };