From 1af3286800af08025dfe8c220c0c53fde2b48818 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Tue, 23 Sep 2025 13:55:38 -0400
Subject: [PATCH 1/2] nixos/veilid: node_id -> public_keys

---
 nixos/modules/services/networking/veilid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/veilid.nix b/nixos/modules/services/networking/veilid.nix
index d471a5f61952..3540e9abd849 100644
--- a/nixos/modules/services/networking/veilid.nix
+++ b/nixos/modules/services/networking/veilid.nix
@@ -193,7 +193,7 @@ in
                   default = [ "bootstrap.veilid.net" ];
                   description = "Host name of existing well-known Veilid bootstrap servers for the network to connect to.";
                 };
-                node_id = lib.mkOption {
+                public_keys = lib.mkOption {
                   type = lib.types.nullOr lib.types.str;
                   default = null;
                   description = "Base64-encoded public key for the node, used as the node's ID.";

From 0141e79663db435152a245f390ab8168c13ac6ad Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Wed, 25 Mar 2026 02:23:45 -0400
Subject: [PATCH 2/2] nixos/veilid: remove old defaults

---
 nixos/modules/services/networking/veilid.nix | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/veilid.nix b/nixos/modules/services/networking/veilid.nix
index 3540e9abd849..e270fe7c076c 100644
--- a/nixos/modules/services/networking/veilid.nix
+++ b/nixos/modules/services/networking/veilid.nix
@@ -10,7 +10,12 @@ let
   dataDir = "/var/db/veilid-server";
 
   settingsFormat = pkgs.formats.yaml { };
-  configFile = settingsFormat.generate "veilid-server.conf" cfg.settings;
+
+  configFile = settingsFormat.generate "veilid-server.conf" (
+    lib.converge (lib.filterAttrsRecursive (
+      _: v: v != null && v != { } && v != "" && v != [ ]
+    )) cfg.settings
+  );
 in
 {
   config = mkIf cfg.enable {
@@ -157,13 +162,13 @@ in
             };
             protected_store = {
               allow_insecure_fallback = mkOption {
-                type = types.bool;
-                default = true;
+                type = lib.types.nullOr types.bool;
+                default = null;
                 description = "If we can't use system-provided secure storage, should we proceed anyway?";
               };
               always_use_insecure_storage = mkOption {
-                type = types.bool;
-                default = true;
+                type = lib.types.nullOr types.bool;
+                default = null;
                 description = "Should we bypass any attempt to use system-provided secure storage?";
               };
               directory = mkOption {
@@ -189,8 +194,8 @@ in
             network = {
               routing_table = {
                 bootstrap = mkOption {
-                  type = types.listOf types.str;
-                  default = [ "bootstrap.veilid.net" ];
+                  type = lib.types.nullOr (types.listOf types.str);
+                  default = null;
                   description = "Host name of existing well-known Veilid bootstrap servers for the network to connect to.";
                 };
                 public_keys = lib.mkOption {
@@ -201,8 +206,8 @@ in
               };
               dht = {
                 min_peer_count = mkOption {
-                  type = types.number;
-                  default = 20;
+                  type = lib.types.nullOr types.number;
+                  default = null;
                   description = "Minimum number of nodes to keep in the peer table.";
                 };
               };