refactor: nix/host-modules + nix/agent-modules layout, update doc paths
This commit is contained in:
parent
cb755b677c
commit
4a48ce5024
52 changed files with 48 additions and 44 deletions
12
flake.nix
12
flake.nix
|
|
@ -20,7 +20,7 @@
|
|||
# nix/checks.nix flake checks
|
||||
# nix/devshell.nix dev shell
|
||||
# nix/treefmt.nix formatter config
|
||||
# nix/modules/, nix/templates/ the NixOS module + container trees
|
||||
# nix/host-modules/, nix/agent-modules/, nix/templates/ the NixOS module trees
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
let
|
||||
# Package wiring for agent containers — the harness modules
|
||||
# consume hyperhive's own packages via the `hyperhive.packages`
|
||||
# option (see nix/templates/harness/packages.nix); no overlay.
|
||||
# option (see nix/agent-modules/packages.nix); no overlay.
|
||||
# `mkDefault` so a per-agent override of an individual key wins.
|
||||
agentPackages =
|
||||
{ lib, pkgs, ... }:
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
./nix/templates/ruth.nix
|
||||
agentPackages
|
||||
];
|
||||
# The full host stack (nix/modules/default.nix aggregator) plus
|
||||
# The full host stack (nix/host-modules/default.nix aggregator) plus
|
||||
# the package/source wiring from this flake. The wiring is a
|
||||
# plain config module setting the `services.hyperhive.c0re.*`
|
||||
# package options via `lib.mkDefault` — no overlay involved, and
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
default =
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
imports = [ ./nix/modules ];
|
||||
imports = [ ./nix/host-modules ];
|
||||
services.hyperhive.c0re = {
|
||||
package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
frontend = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.frontend;
|
||||
|
|
@ -136,8 +136,8 @@
|
|||
managerToplevel = lib.mkDefault self.packages.x86_64-linux.ruth-toplevel;
|
||||
};
|
||||
};
|
||||
hive-ci = ./nix/modules/hive-ci.nix;
|
||||
hive-forge = ./nix/modules/hive-forge;
|
||||
hive-ci = ./nix/host-modules/hive-ci.nix;
|
||||
hive-forge = ./nix/host-modules/hive-forge;
|
||||
};
|
||||
|
||||
nixosConfigurations =
|
||||
|
|
|
|||
Loading…
Reference in a new issue