various wireguard fixes

2 files changed, 12 insertions, 5 deletions

diff --git a/modules/wireguard/nixos/default.nix b/modules/wireguard/nixos/default.nix
index ada218a..706048e 100644
--- a/modules/wireguard/nixos/default.nix
+++ b/modules/wireguard/nixos/default.nix
@@ -23,11 +23,17 @@ in
 
         wireguardPeers =
           cfg.peers
-          |> builtins.mapAttrs (_: m: {
-            PublicKey = m.publicKey;
-            AllowedIPs = [m.ip];
-            Endpoint = m.endpoint;
-          })
+          |> builtins.mapAttrs (_: m:
+            if (m == null)
+            then {
+              PublicKey = m.publicKey;
+              AllowedIPs = [m.ip];
+            }
+            else {
+              PublicKey = m.publicKey;
+              AllowedIPs = [m.ip];
+              Endpoint = m.endpoint;
+            })
           |> builtins.attrValues;
       };
 
diff --git a/modules/wireguard/options.nix b/modules/wireguard/options.nix
index 94d62e9..c3c574f 100644
--- a/modules/wireguard/options.nix
+++ b/modules/wireguard/options.nix
@@ -31,6 +31,7 @@ in {
             endpoint = mkOption {
               type = lib.types.nullOr lib.types.str;
               description = "peer's endpoint";
+              default = null;
             };
           };
         });