From f33bafecc81cca02473c1f3660c7d49e4f87f6e8 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 1 Sep 2020 10:11:26 +0200 Subject: [PATCH] Make nix-direnv actually work I somehow forgot to add the `.direnvrc` to homeshick. Now `nix-shell`s created with direnv are added as gc roots. --- .gitmodules | 3 --- home/.direnvrc | 3 +++ home/.nix-direnv | 1 - nix-direnv | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 home/.direnvrc delete mode 120000 home/.nix-direnv delete mode 160000 nix-direnv diff --git a/.gitmodules b/.gitmodules index ba5930a..be3b9da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,6 +19,3 @@ [submodule "zsh-nix-shell"] path = zsh-nix-shell url = https://github.com/chisui/zsh-nix-shell -[submodule "nix-direnv"] - path = nix-direnv - url = https://github.com/nix-community/nix-direnv diff --git a/home/.direnvrc b/home/.direnvrc new file mode 100644 index 0000000..aad69cf --- /dev/null +++ b/home/.direnvrc @@ -0,0 +1,3 @@ +if [ -f /run/current-system/sw/share/nix-direnv/direnvrc ]; then + source /run/current-system/sw/share/nix-direnv/direnvrc +fi diff --git a/home/.nix-direnv b/home/.nix-direnv deleted file mode 120000 index c4c72d5..0000000 --- a/home/.nix-direnv +++ /dev/null @@ -1 +0,0 @@ -../nix-direnv \ No newline at end of file diff --git a/nix-direnv b/nix-direnv deleted file mode 160000 index 300258e..0000000 --- a/nix-direnv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 300258e2bded28c284451f4fac8475b2240b46f6