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

Merge pull request 'Vars/helper: remove unneeded wrapper arount collectFiles' (#4304) from vars-angnostic into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4304
This commit is contained in:
hsjobeki
2025-07-11 14:31:20 +00:00
parent f7671c8f0b c285c737fe
commit f5f77d96ee
3 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nixosModules/clanCore/vars/secret/sops/collectFiles.nix Normal file
View File

@@ -0,0 +1,37 @@
# collectFiles helper function
{
lib ? import <nixpkgs/lib>,
}:
let
inherit (lib)
filterAttrs
flatten
mapAttrsToList
;
in
generators:
let
relevantFiles =
generator:
filterAttrs (
_name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services")
) generator.files;
allFiles = flatten (
mapAttrsToList (
gen_name: generator:
mapAttrsToList (fname: file: {
name = fname;
generator = gen_name;
neededForUsers = file.neededFor == "users";
inherit (generator) share;
inherit (file)
owner
group
mode
restartUnits
;
}) (relevantFiles generator)
) generators
);
in
allFiles

2
nixosModules/clanCore/vars/secret/sops/default.nix
View File

@@ -7,7 +7,7 @@
}: }:
let let
inherit (import ./funcs.nix { inherit lib; }) collectFiles; collectFiles = import ./collectFiles.nix { inherit lib; };
machineName = config.clan.core.settings.machine.name; machineName = config.clan.core.settings.machine.name;

42
nixosModules/clanCore/vars/secret/sops/funcs.nix
View File

@@ -1,42 +0,0 @@
{
lib ? import <nixpkgs/lib>,
...
}:
let
inherit (lib)
filterAttrs
flatten
mapAttrsToList
;
in
{
collectFiles =
generators:
let
relevantFiles =
generator:
filterAttrs (
_name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services")
) generator.files;
allFiles = flatten (
mapAttrsToList (
gen_name: generator:
mapAttrsToList (fname: file: {
name = fname;
generator = gen_name;
neededForUsers = file.neededFor == "users";
inherit (generator) share;
inherit (file)
owner
group
mode
restartUnits
;
}) (relevantFiles generator)
) generators
);
in
allFiles;
}