From 7b1b023f4a7894e8df5aae1c1f76c1d88c0f198a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 28 Apr 2024 09:09:41 +0200
Subject: dev/base: don't overwrite direnvrc (contains nix-direnv include)

---
 user/settings/development/base.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'user')

diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index e86a0b6e..4c0f2eb7 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -72,15 +72,15 @@
         ];
       };
     };
+    stdlib = ''
+      declare -A direnv_layout_dirs
+      direnv_layout_dir() {
+        echo "''${direnv_layout_dirs[$PWD]:=$(
+          local hash="$(${pkgs.coreutils}/bin/sha256sum - <<<"''${PWD}" | cut -c-7)"
+      		local path="''${PWD//[^a-zA-Z0-9]/-}"
+          echo "${config.xdg.cacheHome}/direnv/layouts/''${hash}''${path}"
+        )}"
+      }
+    '';
   };
-  xdg.configFile."direnv/direnvrc".text = ''
-    declare -A direnv_layout_dirs
-    direnv_layout_dir() {
-      echo "''${direnv_layout_dirs[$PWD]:=$(
-        local hash="$(${pkgs.coreutils}/bin/sha256sum - <<<"''${PWD}" | cut -c-7)"
-    		local path="''${PWD//[^a-zA-Z0-9]/-}"
-        echo "${config.xdg.cacheHome}/direnv/layouts/''${hash}''${path}"
-      )}"
-    }
-  '';
 }
-- 
cgit 1.4.1