From 66786c24557ca826e2c03e85959063e9af5d1957 Mon Sep 17 00:00:00 2001
From: Nettika <git@nettika.cat>
Date: Wed, 25 Sep 2024 21:05:05 -0700
Subject: [PATCH] Move zerotier out of the common module

---
 flake.nix                  | 1 +
 hosts/marauder/default.nix | 1 +
 hosts/monolith/default.nix | 1 +
 modules/common.nix         | 7 +------
 modules/zerotier.nix       | 7 +++++++
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 modules/zerotier.nix

diff --git a/flake.nix b/flake.nix
index 2827f99..82a4dc7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
         common = import ./modules/common.nix;
         prompt = import ./modules/prompt.nix;
         server = import ./modules/server.nix;
+        zerotier = import ./modules/zerotier.nix;
       };
 
       nixosConfigurations = {
diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix
index 6d76f7a..c65b45b 100755
--- a/hosts/marauder/default.nix
+++ b/hosts/marauder/default.nix
@@ -3,6 +3,7 @@
   imports = [
     self.nixosModules.common
     self.nixosModules.prompt
+    self.nixosModules.zerotier
     ./backup.nix
     ./dev.nix
     ./printing.nix
diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix
index 1be73a2..a454981 100755
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -4,6 +4,7 @@
     self.nixosModules.common
     self.nixosModules.prompt
     self.nixosModules.server
+    self.nixosModules.zerotier
     ./dns.nix
   ];
 
diff --git a/modules/common.nix b/modules/common.nix
index d940556..6d60bff 100755
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -1,4 +1,4 @@
-{ pkgs, secrets, ... }:
+{ pkgs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
@@ -41,11 +41,6 @@
     '';
   };
 
-  services.zerotierone = {
-    enable = true;
-    joinNetworks = secrets.zerotier.networks;
-  };
-
   environment.systemPackages = with pkgs; [
     git-crypt
     jq
diff --git a/modules/zerotier.nix b/modules/zerotier.nix
new file mode 100644
index 0000000..6b768c9
--- /dev/null
+++ b/modules/zerotier.nix
@@ -0,0 +1,7 @@
+{ secrets, ... }:
+{
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = secrets.zerotier.networks;
+  };
+}