From e37634fb80c45772c3bc48f7b110dd9f8a023eea Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Thu, 23 Jul 2020 17:03:08 -0600
Subject: [PATCH] shell.nix: don't override NIX_CONF_DIR

---
 shell.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/shell.nix b/shell.nix
index 4e165c6f..884b5463 100644
--- a/shell.nix
+++ b/shell.nix
@@ -10,15 +10,10 @@ in pkgs.mkShell {
 
   shellHook = ''
     mkdir -p secrets
+    PATH=${
+      pkgs.writeShellScriptBin "nix" ''
+        ${pkgs.nixFlakes}/bin/nix --option experimental-features "nix-command flakes ca-references" $@
+      ''
+    }/bin:$PATH
   '';
-
-  NIX_CONF_DIR = let
-    current = pkgs.lib.optionalString (builtins.pathExists /etc/nix/nix.conf)
-      (builtins.readFile /etc/nix/nix.conf);
-
-    nixConf = pkgs.writeTextDir "opt/nix.conf" ''
-      ${current}
-      experimental-features = nix-command flakes ca-references
-    '';
-  in "${nixConf}/opt";
 }