nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-16 14:01:08 +01:00
Code Activity

direnv: fix silent clobbering global config

Browse source 
When the silent flag was refactored to pass in configuration. We
accidentally introduced a bug that clobbered any `global` settings.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2025-07-15 10:26:54 -05:00
parent e595fe1df4
commit 63994b71d2
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/programs/direnv.nix
View file

@ -126,19 +126,15 @@ in
mkIf cfg.enable { mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xdg.configFile."direnv/direnv.toml" = programs.direnv.config = {
mkIf (cfg.config != { } || (cfg.silent && isVersion236orHigher)) global = mkIf (cfg.silent && isVersion236orHigher) {
{ log_format = "-";
source = tomlFormat.generate "direnv-config" ( log_filter = "^$";
cfg.config };
// lib.optionalAttrs (cfg.silent && isVersion236orHigher) { };
global = { xdg.configFile."direnv/direnv.toml" = mkIf (cfg.config != { }) {
log_format = "-"; source = tomlFormat.generate "direnv-config" cfg.config;
log_filter = "^$"; };
};
}
);
};
xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable { xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable {
source = "${cfg.nix-direnv.package}/share/nix-direnv/direnvrc"; source = "${cfg.nix-direnv.package}/share/nix-direnv/direnvrc";