From 83e191134a570a07f00e99e05dbdcf3d047183dd Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 17:18:34 +0100
Subject: [PATCH 1/2] Persist zerotierone state

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

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

From 9d4b2b4b7f80829f4a0f9ed0e925bf3844dc9fd4 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 17:18:47 +0100
Subject: [PATCH 2/2] Remove useless generated /etc/hosts

---
 modules/wireguard-common/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/wireguard-common/default.nix b/modules/wireguard-common/default.nix
index 491bc54..e67cf81 100644
--- a/modules/wireguard-common/default.nix
+++ b/modules/wireguard-common/default.nix
@@ -24,9 +24,4 @@
     privateKeyFile = config.age.secrets."${config.networking.hostName}-wireguard-private-key".path;
     listenPort = 51820;
   };
-
-  networking.hosts = lib.mapAttrs' (hostname: vpnConfig: {
-    name = vpnConfig.ip;
-    value = [ "${hostname}.wg.aciceri.dev" ];
-  }) vpn;
 }