From 41f6c055043e3584dd532306ee07c877143bda1c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 24 Jan 2025 11:37:47 -0600 Subject: [PATCH] nixos/pay-respects: fix environment config Unable to build flake since this was introduced, seems it clobbers other configuration attributes. --- nixos/modules/programs/pay-respects.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index fe4a2610903b..c44fec300851 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -8,11 +8,11 @@ let inherit (lib) getExe isBool + listToAttrs literalExpression maintainers mkEnableOption mkIf - mkMerge mkOption mkPackageOption optionalString @@ -169,16 +169,19 @@ in "url" "model" ]; - environment = mkMerge ( - [ - { - systemPackages = [ finalPackage ]; - } - ] - ++ map (rule: { - etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; - }) cfg.runtimeRules - ); + + environment = { + etc = listToAttrs ( + map (rule: { + name = "xdg/pay-respects/rules/${rule.command}.toml"; + value = { + source = generate "${rule.command}.toml" rule; + }; + }) cfg.runtimeRules + ); + + systemPackages = [ finalPackage ]; + }; programs = { bash.interactiveShellInit = initScript "bash";