From eba34bf2f78c622eeae800d777b9bc0f378bb5f3 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 8 Dec 2023 19:08:57 +0100 Subject: [PATCH] Changed clanIcon to be included into clanCore --- lib/build-clan/default.nix | 3 +-- nixosModules/clanCore/flake-module.nix | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index a743c390c..c3a9ddb69 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -43,6 +43,7 @@ let { clanCore.machineName = name; clanCore.clanName = clanName; + clanCore.clanIcon = clanIcon; clanCore.clanDir = directory; nixpkgs.hostPlatform = lib.mkForce system; @@ -82,8 +83,6 @@ in clanInternals = { machines = configsPerSystem; - clanName = clanName; - clanIcon = clanIcon; 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; diff --git a/nixosModules/clanCore/flake-module.nix b/nixosModules/clanCore/flake-module.nix index 584aaa4b6..ddac88f18 100644 --- a/nixosModules/clanCore/flake-module.nix +++ b/nixosModules/clanCore/flake-module.nix @@ -32,6 +32,12 @@ the location of the flake repo, used to calculate the location of facts and secrets ''; }; + clanIcon = lib.mkOption { + type = lib.types.path; + description = '' + the location of the clan icon + ''; + }; machineName = lib.mkOption { type = lib.types.str; description = ''