nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-17 06:21:10 +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

14
modules/programs/direnv.nix
View file

@ -126,18 +126,14 @@ 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) {
{
source = tomlFormat.generate "direnv-config" (
cfg.config
// lib.optionalAttrs (cfg.silent && isVersion236orHigher) {
global = {
log_format = "-"; log_format = "-";
log_filter = "^$"; 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 { xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable {