about summary refs log tree commit diff
path: root/emacs
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-08-18T11·00+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-08-20T10·26+0100
commit0c71fc9d1d49daa914c0f56f4f9201d40415d9b4 (patch)
tree3c8a4b894065e64111c20d06026b63db17259c65 /emacs
parent51ec9e0d88b15276ec0891f932f6b572d6450809 (diff)
Drop support for dir-locals.nix, <nixpkgs>, etc.
In the spirit of Marie Kondo, I'm tidying up!

TL;DR:
- Prefer .envrc `use_nix` and delete all dir-locals.nix files
- Remove ~all references to <nixpkgs>, <unstable>, <depot> and prefer
  referencing each with briefcase.third_party.{pkgs,unstable,depot}
- Delete nixBufferFromShell function since I was only using that in
  dir-locals.nix files
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/snippets/nix-mode/shell-nix7
-rw-r--r--emacs/.emacs.d/wpc/wpc-nix.el2
2 files changed, 5 insertions, 4 deletions
diff --git a/emacs/.emacs.d/snippets/nix-mode/shell-nix b/emacs/.emacs.d/snippets/nix-mode/shell-nix
index 4c308bb51b3a..45cb24e2b9e3 100644
--- a/emacs/.emacs.d/snippets/nix-mode/shell-nix
+++ b/emacs/.emacs.d/snippets/nix-mode/shell-nix
@@ -2,9 +2,10 @@
 # name: shell.nix boilerplate
 # key: import
 # --
-with import <nixpkgs> {};
-
-stdenv.mkDerivation {
+let
+  briefcase = with import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
+in stdenv.mkDerivation {
   name = "$1";
   buildInputs = [
     $2
diff --git a/emacs/.emacs.d/wpc/wpc-nix.el b/emacs/.emacs.d/wpc/wpc-nix.el
index b67a0f80f95d..501531f23789 100644
--- a/emacs/.emacs.d/wpc/wpc-nix.el
+++ b/emacs/.emacs.d/wpc/wpc-nix.el
@@ -59,7 +59,7 @@ This function was taken from @tazjin's depot and adapted for my monorepo.
   (interactive "sAttribute: ")
   (lexical-let* ((outbuf (get-buffer-create (format "*briefcase-out/%s*" attribute)))
          (errbuf (get-buffer-create (format "*briefcase-errors/%s*" attribute)))
-         (expression (format "let depot = import <depot> {}; briefcase = import <briefcase> {}; in depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attribute))
+         (expression (format "let briefcase = import <briefcase> {}; in briefcase.third_party.depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attribute))
          (command (list "nix-build" "-E" expression)))
     (message "Acquiring Lisp for <briefcase>.%s" attribute)
     (make-process :name (format "nix-build/%s" attribute)