about summary refs log tree commit diff
path: root/scratch
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-03-27T10·47+0000
committerWilliam Carroll <wpcarro@gmail.com>2020-03-27T10·59+0000
commit6b224a9e314b6faedd25fc5361a5bb6ac8c3e0a3 (patch)
treeac2eb6daf0d73d4b98a032feac679f5b5840cdd9 /scratch
parent47a0b45f5f5620aa683f90186008526b8a4c6d68 (diff)
Drop support for lorri
Lorri does not cleanly integrate with my corporate device, which cannot run
NixOS. To expose dependencies to Emacs buffers, I will use nix-buffer.el, which
reads its values from dir-locals.nix. To easily expose dependencies from my
existing shell.nix files into dir-locals.nix, I wrote a Nix utility function.
Diffstat (limited to 'scratch')
-rw-r--r--scratch/deepmind/part_two/.envrc1
-rw-r--r--scratch/deepmind/part_two/dir-locals.nix3
-rw-r--r--scratch/deepmind/part_two/shell.nix6
3 files changed, 6 insertions, 4 deletions
diff --git a/scratch/deepmind/part_two/.envrc b/scratch/deepmind/part_two/.envrc
index b80e28b4b815..1abb058f60d5 100644
--- a/scratch/deepmind/part_two/.envrc
+++ b/scratch/deepmind/part_two/.envrc
@@ -1,2 +1 @@
 source_up
-eval "$(lorri direnv)"
diff --git a/scratch/deepmind/part_two/dir-locals.nix b/scratch/deepmind/part_two/dir-locals.nix
new file mode 100644
index 000000000000..498f4b5055f8
--- /dev/null
+++ b/scratch/deepmind/part_two/dir-locals.nix
@@ -0,0 +1,3 @@
+let
+  briefcase = import <briefcase> {};
+in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/scratch/deepmind/part_two/shell.nix b/scratch/deepmind/part_two/shell.nix
index 606dd7167f7c..65de884696d0 100644
--- a/scratch/deepmind/part_two/shell.nix
+++ b/scratch/deepmind/part_two/shell.nix
@@ -1,6 +1,6 @@
-{ pkgs ? import <nixpkgs> {}, ... }:
-
-pkgs.mkShell {
+let
+  pkgs = import <nixpkgs> {};
+in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
     python3