From 63994b71d223b48007dbec0089bbfd62d9cd4e1d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 15 Jul 2025 10:26:54 -0500
Subject: [PATCH] direnv: fix silent clobbering global config

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>
---
 modules/programs/direnv.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index de616a70..fd2a57d0 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -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";