yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Changed clanIcon to be included into clanCore' (#633) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot
2023-12-08 18:11:48 +00:00
parent dd060b04f8 c4331b168d
commit 69d7b81aee
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/build-clan/default.nix
View File

@@ -43,6 +43,7 @@ let
{ {
clanCore.machineName = name; clanCore.machineName = name;
clanCore.clanName = clanName; clanCore.clanName = clanName;
clanCore.clanIcon = clanIcon;
clanCore.clanDir = directory; clanCore.clanDir = directory;
nixpkgs.hostPlatform = lib.mkForce system; nixpkgs.hostPlatform = lib.mkForce system;
@@ -82,8 +83,6 @@ in
clanInternals = { clanInternals = {
machines = configsPerSystem; machines = configsPerSystem;
clanName = clanName;
clanIcon = clanIcon;
all-machines-json = lib.mapAttrs all-machines-json = lib.mapAttrs
(system: configs: nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (lib.mapAttrs (_: m: m.config.system.clan.deployment.data) configs)) (system: configs: nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (lib.mapAttrs (_: m: m.config.system.clan.deployment.data) configs))
configsPerSystem; configsPerSystem;

6
nixosModules/clanCore/flake-module.nix
View File

@@ -32,6 +32,12 @@
the location of the flake repo, used to calculate the location of facts and secrets 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 { machineName = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = '' description = ''