From 1834304bc3849bfec635cab408e6090d536a549f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Oct 2024 22:10:39 +0300
Subject: [PATCH] direnv: simplify, work around nushell/nushell#14112

nushell 0.99 does not like early returns in hooks. So, what if we just
didn't? Rewrite the entire hook to work as one single pipeline.
---
 modules/programs/direnv.nix | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 4d4862afb..228430c24 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -162,28 +162,20 @@ in {
           $env.config.hooks.pre_prompt?
           | default []
           | append {||
-              let direnv = (
-                  ${direnvWrapped}
-                  | from json --strict
-                  | default {}
-              )
-              if ($direnv | is-empty) {
-                  return
-              }
-              $direnv
+              ${direnvWrapped}
+              | from json --strict
+              | default {}
               | items {|key, value|
-                  {
-                      key: $key
-                      value: (do (
-                          $env.ENV_CONVERSIONS?
-                          | default {}
-                          | get -i $key
-                          | get -i from_string
-                          | default {|x| $x}
-                      ) $value)
-                  }
+                  let value = do (
+                      $env.ENV_CONVERSIONS?
+                      | default {}
+                      | get -i $key
+                      | get -i from_string
+                      | default {|x| $x}
+                  ) $value
+                  return [ $key $value ]
               }
-              | transpose -ird
+              | into record
               | load-env
           }
       )