From 9d89fa5d825be5a8ab495b4e2146a5f53c77bd88 Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Sun, 14 Jan 2024 11:54:54 -0800
Subject: [PATCH] Adds hydra job for nixbox system

---
 common/globals.nix         | 2 +-
 flake.nix                  | 4 +++-
 nixos/hosts/nixbox.nix     | 3 +--
 nixos/modules/zerotier.nix | 4 ++--
 nixos/profiles/default.nix | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/globals.nix b/common/globals.nix
index 5622750..baa25bb 100644
--- a/common/globals.nix
+++ b/common/globals.nix
@@ -17,5 +17,5 @@
 
   sshAuthorizedKeyFiles = [./sshpubkeys/willem-nixbox ./sshpubkeys/willem-thinkpad ./sshpubkeys/willem-zeus];
 
-  secrets = import ./secrets.nix;
+  zerotier.networks = ["17d709436ca2929d"];
 }
diff --git a/flake.nix b/flake.nix
index d1bc1dd..b62ea21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,7 +75,7 @@
         mkDarwin = arch: (mkSystem darwin.lib.darwinSystem "${arch}-darwin");
 
         forAllSystems = nixpkgs.lib.genAttrs systems;
-      in {
+      in rec {
         overlays = {
           default = import ./packages;
           fenix = inputs.fenix.overlays.default;
@@ -105,6 +105,8 @@
           x86_64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
           aarch64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
         };
+
+        hydraJobs.x86_64-linux = packages.x86_64-linux;
       };
 
       perSystem = {
diff --git a/nixos/hosts/nixbox.nix b/nixos/hosts/nixbox.nix
index f85a3de..7a61525 100644
--- a/nixos/hosts/nixbox.nix
+++ b/nixos/hosts/nixbox.nix
@@ -13,7 +13,6 @@ in {
     ../profiles/default.nix
     ../users/willem/home/linux.nix
     ../modules/zerotier.nix
-    ../modules/nordvpn.nix
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
@@ -58,7 +57,7 @@ in {
   users.groups.torrent.gid = torrent_group_id;
 
   services.transmission = {
-    enable = true;
+    enable = false;
 
     package = pkgs.transmission_4;
 
diff --git a/nixos/modules/zerotier.nix b/nixos/modules/zerotier.nix
index f518489..9c734fc 100644
--- a/nixos/modules/zerotier.nix
+++ b/nixos/modules/zerotier.nix
@@ -1,4 +1,4 @@
-{...}: {
+{globals, ...}: {
   services.zerotierone.enable = true;
-  services.zerotierone.joinNetworks = ["17d709436ca2929d"];
+  services.zerotierone.joinNetworks = globals.zerotier.networks;
 }
diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix
index 1b4de56..676ff77 100644
--- a/nixos/profiles/default.nix
+++ b/nixos/profiles/default.nix
@@ -23,7 +23,7 @@
   environment.systemPackages = [pkgs.parted];
 
   services.zerotierone = {
-    joinNetworks = globals.secrets.zerotier.networks;
+    joinNetworks = globals.zerotier.networks;
     enable = true;
   };