summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2024-04-29 18:48:20 +0200
committerAlan Pearce2024-04-29 19:33:28 +0200
commit7ae86e21a36265d432a7384a525add7ca617b0bf (patch)
treeba356bcaf406cf775e969504c5da124b6d321f02
parent0b95bda2a740a02932a8d196f9642737c14d0ea7 (diff)
downloadnixfiles-7ae86e21a36265d432a7384a525add7ca617b0bf.tar.lz
nixfiles-7ae86e21a36265d432a7384a525add7ca617b0bf.tar.zst
nixfiles-7ae86e21a36265d432a7384a525add7ca617b0bf.zip
fix lorri flake compatibility
-rw-r--r--.envrc7
-rw-r--r--shell.nix2
2 files changed, 7 insertions, 2 deletions
diff --git a/.envrc b/.envrc
index 3550a30f..8075d5b0 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,6 @@
-use flake
+if type -P lorri &>/dev/null; then
+	eval "$(lorri direnv)"
+else
+	echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]'
+	use flake
+fi
diff --git a/shell.nix b/shell.nix
index 9730ebde..d2c4c458 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,3 +1,3 @@
 { system ? builtins.currentSystem }:
 
-(builtins.getFlake (toString ./.)).devShell.${system}
+(builtins.getFlake (toString ./.)).devShells.${system}.default