about summary refs log tree commit diff
path: root/emacs/.emacs.d/wpc/wpc-nix.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/.emacs.d/wpc/wpc-nix.el')
-rw-r--r--emacs/.emacs.d/wpc/wpc-nix.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/emacs/.emacs.d/wpc/wpc-nix.el b/emacs/.emacs.d/wpc/wpc-nix.el
index 68d542e01176..7407e02bfd41 100644
--- a/emacs/.emacs.d/wpc/wpc-nix.el
+++ b/emacs/.emacs.d/wpc/wpc-nix.el
@@ -8,8 +8,10 @@
 ;; Dependencies
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(prelude/assert (f-exists? "~/universe"))
-(prelude/assert (f-exists? "~/depot"))
+;; TODO: These may fail at startup. How can I make sure that the .envrc is
+;; consulted when Emacs starts?
+(prelude/assert (f-exists? (getenv "BRIEFCASE")))
+(prelude/assert (f-exists? (getenv "DEPOT")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Library
@@ -19,7 +21,7 @@
 (use-package nix-mode
   :mode "\\.nix\\'")
 
-(defun nix/sly-from-universe (attribute)
+(defun nix/sly-from-briefcase (attribute)
   "Start a Sly REPL configured with a Lisp matching a derivation
   from my monorepo.
 
@@ -29,12 +31,12 @@ This function was taken from @tazjin's depot and adapted for my monorepo.
   asynchronously. The build output is included in the error
   thrown on build failures."
   (interactive "sAttribute: ")
-  (lexical-let* ((outbuf (get-buffer-create (format "*universe-out/%s*" attribute)))
-         (errbuf (get-buffer-create (format "*universe-errors/%s*" attribute)))
-         (expression (format "let depot = import <depot> {}; universe = import <universe> {}; in depot.nix.buildLisp.sbclWith [ universe.%s ]" attribute))
+  (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))
          (command (list "nix-build" "-E" expression)))
-    (message "Acquiring Lisp for <depot>.%s" attribute)
-    (make-process :name (format "depot-nix-build/%s" attribute)
+    (message "Acquiring Lisp for <briefcase>.%s" attribute)
+    (make-process :name (format "nix-build/%s" attribute)
                   :buffer outbuf
                   :stderr errbuf
                   :command command
@@ -45,7 +47,7 @@ This function was taken from @tazjin's depot and adapted for my monorepo.
                           ("finished\n"
                            (let* ((outpath (s-trim (with-current-buffer outbuf (buffer-string))))
                                   (lisp-path (s-concat outpath "/bin/sbcl")))
-                             (message "Acquired Lisp for <depot>.%s at %s" attribute lisp-path)
+                             (message "Acquired Lisp for <briefcase>.%s at %s" attribute lisp-path)
                              (sly lisp-path)))
                           (_ (with-current-buffer errbuf
                                (error "Failed to build '%s':\n%s" attribute (buffer-string)))))