From fde19f01171c0e6972dbe85b9af526cc8a3ee975 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 25 Dec 2020 22:09:09 -0700 Subject: [PATCH] direnv: use nix-direnv instead ad hoc hack --- profiles/core/default.nix | 2 ++ users/profiles/direnv/default.nix | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 21f9542a..53d43cb9 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -124,6 +124,8 @@ in extraOptions = '' experimental-features = nix-command flakes ca-references min-free = 536870912 + keep-outputs = true + keep-derivations = true ''; }; diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix index e24c6049..173a9c58 100644 --- a/users/profiles/direnv/default.nix +++ b/users/profiles/direnv/default.nix @@ -1,14 +1,6 @@ { programs.direnv = { enable = true; - stdlib = '' - use_flake() { - mkdir -p $(direnv_layout_dir) - watch_file flake.nix - watch_file flake.lock - eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")" \ - && IN_NIX_SHELL="pure" - } - ''; + enableNixDirenvIntegration = true; }; }