From 7b783f8da5f0afe8e42e3d5bafd3546e6f67b797 Mon Sep 17 00:00:00 2001
From: Matthew Salerno <m@salernosection.com>
Date: Mon, 21 Aug 2023 21:35:03 -0400
Subject: [PATCH] add mailing list, fix disable not doing anything, make "null
 test" test disable

---
 README.md      | 2 ++
 tests/null.nix | 2 ++
 wire.nix       | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3607e87..de24c14 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 [Issue Tracker](https://todo.sr.ht/~msalerno/wirenix)  
+[Mailing List](https://lists.sr.ht/~msalerno/wirenix) ([As Email](mailto:~msalerno/wirenix@lists.sr.ht))
+
 WireNix is a Nix Flake designed to make creation of Wireguard mesh networks
 easier. The simplist and most likely layout is a full mesh network, but Wirenix
 can also support arbitrary graph topologies.  
diff --git a/tests/null.nix b/tests/null.nix
index 850ec46..cb75d7f 100644
--- a/tests/null.nix
+++ b/tests/null.nix
@@ -8,6 +8,8 @@
   nodes = {
     # `self` here is set by using specialArgs in `lib.nix`
     node1 = { self, pkgs, ... }: {
+      imports = [ self.nixosModules.default ];      
+      wirenix.enable = false;
     };
   };
   # This is the test code that will check if our service is running correctly:
diff --git a/wire.nix b/wire.nix
index bc029ea..bd62db1 100644
--- a/wire.nix
+++ b/wire.nix
@@ -108,7 +108,7 @@ in
   # --------------------------------------------------------------- #
   # Due to merge weirdness, I have to define what configuration keys
   # we're touching upfront, and make sure they exist
-  config = (safetyMerge ["networking" "sops" "age" "systemd" "services" "environment"]
+  config = mkIf cfg.enable (safetyMerge ["networking" "sops" "age" "systemd" "services" "environment"]
     [
       (configurer keyProviders (parser acl) cfg.peerName)
     ]