From e5757374d265135eebc5fcfba2ae3efb02f79ce9 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Thu, 18 Jun 2026 01:26:44 +0200
Subject: [PATCH] Make host and docker setupKeys optional for netbird-client
 module

---
 modules/netbird-client.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/netbird-client.nix b/modules/netbird-client.nix
index 897a192..05141e7 100644
--- a/modules/netbird-client.nix
+++ b/modules/netbird-client.nix
@@ -15,7 +15,8 @@ let
     options = {
       setupKey = lib.mkOption {
         description = "Setup Key for this client";
-        type = lib.types.str;
+        type = lib.types.nullOr lib.types.str;
+        default = null;
       };
     };
   };
@@ -44,7 +45,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    services.netbird = {
+    services.netbird = lib.mkIf (cfg.host.setupKey != null) {
       useRoutingFeatures = "both";
       clients.wt0 = {
         hardened = false;
@@ -60,9 +61,9 @@ in {
     };
     systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ];
 
-    services.resolved.enable = true;
+    services.resolved.enable = lib.mkIf (cfg.host.setupKey != null) true;
 
-    virtualisation.oci-containers.containers = {
+    virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) {
       netbird = {
         image = "netbirdio/netbird:${clientVersion}-rootless";
         autoStart = true;
@@ -81,7 +82,7 @@ in {
       };
     };
 
-    systemd.services."docker-netbird" = {
+    systemd.services."docker-netbird" = lib.mkIf (cfg.docker.setupKey != null) {
       after = [
         "docker-network-webproxy.service"
       ];
@@ -91,7 +92,7 @@ in {
     };
 
 
-    systemd.services."docker-network-webproxy" = {
+    systemd.services."docker-network-webproxy" = lib.mkIf (cfg.docker.setupKey != null) {
       path = [ pkgs.docker_29 ];
       serviceConfig = {
         Type = "oneshot";