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

Merge pull request 'Set networking.hostName to clanCore.machineName' (#1140) from networkd into main

Browse Source
This commit is contained in:
clan-bot
2024-04-09 13:14:44 +00:00
parent 26146edbc5 19a62817f2
commit 5dac575be8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@ let
(machines.${name} or { })
(
{
networking.hostName = lib.mkDefault name;
clanCore.clanName = clanName;
clanCore.clanIcon = clanIcon;
clanCore.clanDir = directory;

2
nixosModules/clanCore/facts/secret/sops.nix
View File

@@ -46,7 +46,7 @@ in
clanCore.facts.secretModule = "clan_cli.facts.secret_modules.sops";
clanCore.facts.secretUploadDirectory = lib.mkDefault "/var/lib/sops-nix";
sops.secrets = builtins.mapAttrs (name: _: {
name = lib.strings.removePrefix "${config.networking.hostName}-" name;
name = lib.strings.removePrefix "${config.clanCore.machineName}-" name;
sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
format = "binary";
}) secrets;