summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix5
-rw-r--r--hosts/default.nix9
-rw-r--r--hosts/p-body/default.nix6
3 files changed, 9 insertions, 11 deletions
diff --git a/flake.nix b/flake.nix
index 0f23fd7..b0b2188 100644
--- a/flake.nix
+++ b/flake.nix
@@ -134,7 +134,10 @@
hercules-ci = {
flake-update = {
enable = true;
- when.hour = [0];
+ when = {
+ hour = [0];
+ minute = 0;
+ };
};
};
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;