From 60674990832776aff8f20308e18a19678f0ef4ff Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 18:48:26 +0100
Subject: [PATCH] Make zerotier work on all hosts

---
 modules/zerotier/default.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/zerotier/default.nix b/modules/zerotier/default.nix
index b326c9e..0b5a552 100644
--- a/modules/zerotier/default.nix
+++ b/modules/zerotier/default.nix
@@ -1,17 +1,16 @@
 { config, lib, ... }:
 {
-  config = lib.mkMerge [
-    {
-      services.zerotierone = {
-        enable = true;
-        joinNetworks = [ "632ea29085af0cb4" ];
-      };
-
-    }
-    (lib.mkIf (config.networking.hostName == "sisko") {
-      environment.persistence."/persist".directories = [
-        "/var/lib/zerotier-one"
-      ];
-    })
-  ];
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = [ "632ea29085af0cb4" ];
+  };
+  environment =
+    if (config.networking.hostName == "sisko") then
+      {
+        persistence."/persist".directories = [
+          "/var/lib/zerotier-one"
+        ];
+      }
+    else
+      { };
 }