chn/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2026-01-11 17:39:37 +08:00
Code Issues Packages Projects Releases Wiki 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 {
home.packages = [ cfg.package ];
xdg.configFile."direnv/direnv.toml" =
mkIf (cfg.config != { } || (cfg.silent && isVersion236orHigher))
{
source = tomlFormat.generate "direnv-config" (
cfg.config
// lib.optionalAttrs (cfg.silent && isVersion236orHigher) {
global = {
log_format = "-";
log_filter = "^$";
};
}
);
};
programs.direnv.config = {
global = mkIf (cfg.silent && isVersion236orHigher) {
log_format = "-";
log_filter = "^$";
};
};
xdg.configFile."direnv/direnv.toml" = mkIf (cfg.config != { }) {
source = tomlFormat.generate "direnv-config" cfg.config;
};
xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable {
source = "${cfg.nix-direnv.package}/share/nix-direnv/direnvrc";