movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-19 16:09:19 +03:00
Code Activity

nixos/pay-respects: fix environment config

Browse source 
Unable to build flake since this was introduced, seems it clobbers other
configuration attributes.
This commit is contained in:
Austin Horstman 2025-01-24 11:37:47 -06:00
parent 0aa475546e
commit 41f6c05504
No known key found for this signature in database
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nixos/modules/programs/pay-respects.nix
View file

@ -8,11 +8,11 @@ let
inherit (lib) inherit (lib)
getExe getExe
isBool isBool
listToAttrs
literalExpression literalExpression
maintainers maintainers
mkEnableOption mkEnableOption
mkIf mkIf
mkMerge
mkOption mkOption
mkPackageOption mkPackageOption
optionalString optionalString
@ -169,17 +169,20 @@ in
"url" "url"
"model" "model"
]; ];
environment = mkMerge (
[ environment = {
{ etc = listToAttrs (
systemPackages = [ finalPackage ]; map (rule: {
} name = "xdg/pay-respects/rules/${rule.command}.toml";
] value = {
++ map (rule: { source = generate "${rule.command}.toml" rule;
etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; };
}) cfg.runtimeRules }) cfg.runtimeRules
); );
systemPackages = [ finalPackage ];
};
programs = { programs = {
bash.interactiveShellInit = initScript "bash"; bash.interactiveShellInit = initScript "bash";
fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish"); fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish");