From a4279dea277c265160f93adcd9bcc63911437001 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 11 Sep 2020 15:03:17 +0200 Subject: [PATCH] nix-direnv has flake support \o/ --- configurations/direnv.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/configurations/direnv.nix b/configurations/direnv.nix index dac7a500..e763e0ee 100644 --- a/configurations/direnv.nix +++ b/configurations/direnv.nix @@ -5,27 +5,16 @@ { path = ".local/share/direnv"; type = "cache"; } ]; + nix.extraOptions = '' + keep-outputs = true + keep-derivations = true + ''; + home-manager.users.charlotte = { ... }: { programs.direnv = { enable = true; enableZshIntegration = true; - config = { - global = { - strict_env = true; - }; - }; - stdlib = '' - use_flake() { - watch_file flake.nix - watch_file flake.lock - local profile_dir="$(direnv_layout_dir)/flake-profile" - eval "$(nix print-dev-env --profile "''${profile_dir}")" - local stripped_pwd=''${PWD/\//} - local escaped_pwd=''${stripped_pwd//-/--} - local escaped_pwd=''${escaped_pwd//\//-} - ln -fs "''${profile_dir}" "/nix/var/nix/gcroots/per-user/$USER/''${escaped_pwd}" - } - ''; + enableNixDirenvIntegration = true; }; }; }