From cd5b25f691b5b520de4dcc9a51280fa86c805120 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Thu, 5 Jan 2023 10:28:14 +0530
Subject: [PATCH] Factor out macos HCI

---
 flake.nix               |  1 +
 nix-darwin/hercules.nix | 11 +++++++++++
 systems/darwin.nix      |  9 ---------
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 nix-darwin/hercules.nix

diff --git a/flake.nix b/flake.nix
index e4dfa1a..551abfc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,6 +77,7 @@
           default = self.lib.mkMacosSystem {
             imports = [
               self.darwinModules.default # Defined in nix-darwin/default.nix
+              ./nix-darwin/hercules.nix
               ./systems/darwin.nix
             ];
           };
diff --git a/nix-darwin/hercules.nix b/nix-darwin/hercules.nix
new file mode 100644
index 0000000..d6d0d29
--- /dev/null
+++ b/nix-darwin/hercules.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, inputs, system, ... }:
+
+{
+  # TODO: use agenix to manage
+  # - secrets
+  # - ssh keys
+  services.hercules-ci-agent = {
+    enable = true;
+    package = inputs.hci.packages.${system}.hercules-ci-agent;
+  };
+}
diff --git a/systems/darwin.nix b/systems/darwin.nix
index a70474d..839c1fa 100644
--- a/systems/darwin.nix
+++ b/systems/darwin.nix
@@ -93,15 +93,6 @@
   services.nix-daemon.enable = true;
   # nix.package = pkgs.nix;
 
-  # TODO: use agenix to manage 
-  # - secrets
-  # - ssh keys
-  # TODO: consolidate with nixos/hercules.nix
-  services.hercules-ci-agent = {
-    enable = true;
-    package = inputs.hci.packages.${system}.hercules-ci-agent;
-  };
-
   # Create /etc/bashrc that loads the nix-darwin environment.
   # programs.zsh.enable = true; # default shell on catalina
   # programs.fish.enable = true;