Correctly use mkMerge

hosts/sisko/default.nix

@@ -32,6 +32,7 @@
       "matrix"
       "radarr"
       "zerotier"
+      "mosh"
     ]
     ++ [
       ./disko.nix

modules/cloudflare-dyndns/default.nix

@@ -11,6 +11,7 @@
       "photos.aciceri.dev"
       "jelly.aciceri.dev"
       "matrix.aciceri.dev"
+      "vpn.aciceri.dev"
     ];
     apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path;
   };

modules/zerotier/default.nix

@@ -1,14 +1,17 @@
 { config, lib, ... }:
-lib.mkMerge [
+{
-  {
+  config = lib.mkMerge [
-    services.zerotierone = {
+    {
-      enable = true;
+      services.zerotierone = {
-      joinNetworks = [ "632ea29085af0cb4" ];
+        enable = true;
-    };
+        joinNetworks = [ "632ea29085af0cb4" ];
-  }
+      };
-  (lib.optionalAttrs (config.networking.hostName == "sisko") {
+
-    environment.persistence."/persist".directories = [
+    }
-      "/var/lib/zerotier-one"
+    (lib.mkIf (config.networking.hostName == "sisko") {
-    ];
+      environment.persistence."/persist".directories = [
-  })
+        "/var/lib/zerotier-one"
-]
+      ];
+    })
+  ];
+}