move clanName into nixos machine configuration

2023-12-08 16:02:54 +01:00
parent 08871258bb
commit 26c6954db0
5 changed files with 13 additions and 25 deletions
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -41,6 +41,7 @@ let
        (machines.${name} or { })
        {
          clanCore.machineName = name;
+          clanCore.clanName = clanName;
          clanCore.clanDir = directory;
          nixpkgs.hostPlatform = lib.mkForce system;

@@ -80,7 +81,6 @@ in

  clanInternals = {
    machines = configsPerSystem;
-    clanName = clanName;
    all-machines-json = lib.mapAttrs
      (system: configs: nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (lib.mapAttrs (_: m: m.config.system.clan.deployment.data) configs))
      configsPerSystem;