From e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 9 May 2025 08:48:41 -0500 Subject: [PATCH] Revert "direnv: update nushell env conversion logic (#6999)" (#7014) This reverts commit f2b5bf55aa439a6c517adfcb9715a5a952020c5f. --- modules/programs/direnv.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix index 49d074df..eb9dde52 100644 --- a/modules/programs/direnv.nix +++ b/modules/programs/direnv.nix @@ -175,7 +175,6 @@ in # Using mkAfter to make it more likely to appear after other # manipulations of the prompt. programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration (mkAfter '' - use std/config env-conversions $env.config = ($env.config? | default {}) $env.config.hooks = ($env.config.hooks? | default {}) $env.config.hooks.pre_prompt = ( @@ -187,8 +186,8 @@ in | default {} | items {|key, value| let value = do ( - { PATH: (env-conversions).path } - | merge ($env.ENV_CONVERSIONS? | default {}) + $env.ENV_CONVERSIONS? + | default {} | get -i $key | get -i from_string | default {|x| $x} @@ -199,7 +198,6 @@ in | load-env } ) - hide env-conversions ''); home.sessionVariables = lib.mkIf (cfg.silent && !isVersion236orHigher) { DIRENV_LOG_FORMAT = ""; };