From bce8fbbb78a6f16e4e13b69a5717345e2fc228a9 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 18:09:29 +0100
Subject: [PATCH] Correctly use `mkMerge`

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

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