summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorseth <[email protected]>2023-04-24 01:14:39 -0400
committerseth <[email protected]>2023-04-24 01:14:39 -0400
commitabdb47739e7198f7b3f1a108c61105e1f3e6d3d7 (patch)
treef24b55d2817c22b8e42aecc8262c0245b30bc22f /hosts
parenta4561067979a6be06865eedad40a106eed0f0840 (diff)
pbody: use hercules-ci-agent from flake
Diffstat (limited to 'hosts')
-rw-r--r--hosts/default.nix9
-rw-r--r--hosts/p-body/default.nix6
2 files changed, 5 insertions, 10 deletions
diff --git a/hosts/default.nix b/hosts/default.nix
index 7b13c1b..da3e74b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -58,14 +58,7 @@ in {
};
p-body = {
builder = nixpkgs.lib.nixosSystem;
- inherit (common) system;
-
- specialArgs = let
- unstable = import nixpkgsUnstable {
- inherit (common) system;
- overlays = [guzzle_api.overlays.default];
- };
- in {inherit (unstable) guzzle-api-server;};
+ inherit (common) specialArgs system;
modules = [
agenix.nixosModules.default
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index 665ac64..10d99d0 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -1,12 +1,14 @@
{
config,
+ guzzle_api,
+ hercules-ci-agent,
modulesPath,
pkgs,
- guzzle-api-server,
...
}: {
imports = [
(modulesPath + "/virtualisation/digital-ocean-image.nix")
+ hercules-ci-agent.nixosModules.agent-service
];
base = {
@@ -121,7 +123,7 @@
enable = true;
url = "http://167.99.145.73";
port = "80";
- package = guzzle-api-server;
+ package = guzzle_api.packages.x86_64-linux.guzzle-api-server;
};
hercules-ci-agent.enable = true;