From 37ae2afef6432427a343184041bf7df1da275257 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 18:09:05 +0100
Subject: [PATCH 1/3] Enable `mosh` on `sisko`

---
 hosts/sisko/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix
index 3d5293b..9b9df03 100644
--- a/hosts/sisko/default.nix
+++ b/hosts/sisko/default.nix
@@ -32,6 +32,7 @@
       "matrix"
       "radarr"
       "zerotier"
+      "mosh"
     ]
     ++ [
       ./disko.nix

From c327895c6bf5236a5e4a0fcf6e08c46238d9d9dd Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 14 Mar 2025 18:09:13 +0100
Subject: [PATCH 2/3] Re-add `vpn.aciceri.dev`

---
 modules/cloudflare-dyndns/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/cloudflare-dyndns/default.nix b/modules/cloudflare-dyndns/default.nix
index 5538150..c0f7bff 100644
--- a/modules/cloudflare-dyndns/default.nix
+++ b/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;
   };

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 3/3] 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"
+      ];
+    })
+  ];
+}