From cda5b02a3704fbaf920d837ee9afa26ab12f1043 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Tue, 8 Oct 2024 19:26:17 -0400 Subject: [PATCH] fix: bad lorri hook eval --- .envrc | 9 +++++++++ shell.nix | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 .envrc delete mode 100644 shell.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..4e2fe0f --- /dev/null +++ b/.envrc @@ -0,0 +1,9 @@ +if has lorri; then + eval "$(lorri direnv)" +elif has nix; then + echo "Using flake fallback since lorri isn't installed" + use flake +else + # noop + echo "Unsupported direnv configuration. We need nix flake support and lorri installed" +fi diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 312dff8..0000000 --- a/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); -in -(import ( - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } -) { - src = ./.; -}).devShell \ No newline at end of file