From a65c39e97bb47a415707041340f9c4fd09450550 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Tue, 3 Mar 2026 14:19:43 -0800 Subject: fix emacs in submodule --- config/emacs.org | 4 ++-- flake.nix | 11 +++++++++-- nix | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/emacs.org b/config/emacs.org index 7b3f2d4..41b743d 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -835,10 +835,10 @@ I use tabs because sometimes I like using the mouse (it's actually more efficien ** Lean4 For some reason, lean4-mode is not in MELPA currently so I have to do this ugly thing: #+begin_src emacs-lisp :tangle ../nix/init.el - (use-package lean4-mode + (unless noninteractive (use-package lean4-mode :commands lean4-mode :vc (:url "https://github.com/leanprover-community/lean4-mode.git" - :rev "76895d8939111654a472cfc617cfd43fbf5f1eb6")) + :rev "76895d8939111654a472cfc617cfd43fbf5f1eb6"))) #+end_src and actually pull something from the internet instead of pinning. Thankfully this reproduction issue is probably localized to lean files. Also, we're pulling a specific commit so it is still pinned. If it fails to fetch, lean4 is broken I guess. diff --git a/flake.nix b/flake.nix index 0191615..3a2e474 100644 --- a/flake.nix +++ b/flake.nix @@ -41,15 +41,22 @@ fi website = pkgs.stdenv.mkDerivation { name = "org-publish-website"; src = pkgs.lib.cleanSource ./.; - buildInputs = [ ci-emacs ]; + buildInputs = [ + ci-emacs + pkgs.git + ]; buildPhase = '' +export HOME=$TMPDIR/fake-home +mkdir -p $HOME/.emacs.d mkdir -p public +ln -s "$(pwd)" $HOME/monorepo emacs -Q --batch \ + --eval '(setq noninteractive t)' \ --eval '(setq system-email "ci@dummy.local")' \ --eval '(setq system-username "ci-runner")' \ --eval '(setq system-fullname "CI Pipeline")' \ --eval '(setq system-gpgkey "00000000")' \ - -l ./nix/init.el \ + -l ${hyprnixmacs}/init.el \ --eval '(org-publish-all t)' ''; diff --git a/nix b/nix index bb633be..87364f9 160000 --- a/nix +++ b/nix @@ -1 +1 @@ -Subproject commit bb633be7d8646c0bba143a4055ce4d64efaa9de2 +Subproject commit 87364f917ebc8f08f5eb0a0d5fab0a84ccd7337b -- cgit v1.3