Commit graph

339 commits

Author SHA1 Message Date
Marien Zwart
96d6db2e96 Maybe fix fetching notmuch
This fails the same way emms was, and like emms I do see the commit.
2024-05-18 22:20:56 +10:00
Marien Zwart
cbe7d2586a Attempt to fix emms
CI fails to fetch it:

```
error: Server does not allow request for unadvertised object 87d0d1fb0566a80229029d0d8d7c863138d70aae
warning: could not update mtime for file '/home/runner/.cache/nix/gitv3/0gjpwip102kwcvz961gsiva3lqmmr6266s5wzs8kq0ybm68gwpx9/refs/heads/master': No such file or directory
error:
       … while checking flake output 'checks'
         at /nix/store/fwrwzxjvvpx1l27h8j5f9gffzwn2vdik-source/flake.nix:54:7:
           53|     in {
           54|       checks = perSystemPackages (pkgs:
             |       ^
           55|         let
       … while checking the derivation 'checks.x86_64-linux.full'
         at /nix/store/fwrwzxjvvpx1l27h8j5f9gffzwn2vdik-source/flake.nix:83:11:
           82|           })).emacsWithDoom;
           83|           full = mkDoom {
             |           ^
           84|             full = true;
       (stack trace truncated; use '--show-trace' to show the full trace)
       error: Cannot find Git revision '87d0d1fb0566a80229029d0d8d7c863138d70aae' in ref 'refs/heads/master' of repository 'https://git.savannah.gnu.org/git/emms.git'! Please make sure that the rev exists on the ref you've specified or add allRefs = true; to fetchGit.
```

Try to follow the suggestions from the error message, as I do see the
commit in https://git.savannah.gnu.org/cgit/emms.git/.

I'm not sure why this is only failing now...
2024-05-18 22:20:56 +10:00
Marien Zwart
2e2548e80f Add nix flake check github workflow 2024-05-18 22:20:56 +10:00
Marien Zwart
631c786d8b nix flake update
...with `--override-flake nixpkgs github:NixOS/nixpkgs/nixpkgs-unstable`
(bypass my local registry) to write a flake.lock that should pass
flake-checker.
2024-05-18 22:20:56 +10:00
Marien Zwart
bc808de7fc
Add basic end-to-end test 2024-05-17 21:03:24 +10:00
Marien Zwart
d7c2725a61
Tweak README 2024-05-13 22:53:43 +10:00
Marien Zwart
482f7f3c7f
Apply pins per-repo
I knew this might cause problems at some point, but it came to a head
sooner than expected: it triggered
https://github.com/magit/magit/issues/5131 (magit is pinned but
magit-section was not, and those packages expect to be kept in sync).

The fix is messier than I'd like but at least fixes magit.
2024-05-13 22:09:28 +10:00
Marien Zwart
ebc03f12fe
Add comment about getting nixpkgs through registry 2024-05-12 20:40:49 +10:00
Marien Zwart
1e879c9556
org: make it find its datadir 2024-05-11 22:58:15 +10:00
Marien Zwart
1842251412
org: partially parallel build
Org's build system still builds docs before lisp, but does partially
parallelize.
2024-05-11 22:54:18 +10:00
Marien Zwart
8b4fc00d8e
Use runCommandLocal 2024-05-11 21:32:48 +10:00
Marien Zwart
78eb3559a9
Move most "packages" to checks
Neither "minimal" nor "full" were particularly useful packages.

Add an emacsWithDoom check while I'm there.
2024-05-11 21:09:54 +10:00
Marien Zwart
d216451849
Remove unneeded example init.el comments 2024-05-11 20:43:55 +10:00
Marien Zwart
fe4b632478
Refactor flake / home-manager common code
Avoids having the emacs-overlay hack in two places.
2024-05-11 20:35:42 +10:00
Marien Zwart
f65aa4a718
Remove stale comment 2024-05-11 20:16:45 +10:00
Marien Zwart
310cadf813
Fix flycheck in emacs-lisp buffers
Doom hooks into flycheck's emacs-lisp checker to load itself. This does
not involve its profile loader, so this bypasses our profile dir
customization.

Hook into this hook to add that customization back.
2024-05-09 21:24:13 +10:00
Marien Zwart
e0db277665
Clean up repetitive code 2024-05-07 23:24:37 +10:00
Marien Zwart
2cc2bdaf63
Fix excessively long lines
This keeps nix code within 100 columns except for one string in a
comment.
2024-05-07 23:19:43 +10:00
Marien Zwart
c12417c362
Rename doom.nix to default.nix 2024-05-07 23:02:59 +10:00
Marien Zwart
badafb50f6
Appease statix 2024-05-07 22:59:57 +10:00
Marien Zwart
a435bdc848
Use nix-systems
Not hugely important because it only affects our packages, not overlay
or home-manager module, but might as well.
2024-05-07 22:58:41 +10:00
Marien Zwart
0d1f14d15a
Disable nixpkgs inputs of doom-overlay
They should be unused as all we're using is the overlay. Let's make that
explicit.
2024-05-07 22:36:33 +10:00
Marien Zwart
9ce8bbd4ce
nix flake update 2024-05-04 22:49:22 +10:00
Marien Zwart
c8b82d46ba
Use emacs-overlay directly, not as overlay
Slight hack to avoid instantiating an additional nixpkgs unnecessarily.
2024-05-04 22:48:11 +10:00
Marien Zwart
0dd5a3d425
Appease statix 2024-04-29 15:46:56 +10:00
Marien Zwart
b3ed7ea627
Add a Home Manager module
It turns out using Home Manager's `programs.emacs` module does not work
correctly. Document that in HACKING.md for future reference.
2024-04-29 15:46:13 +10:00
Marien Zwart
7848f69115
Document some known doom doctor complaints 2024-04-29 14:19:43 +10:00
Marien Zwart
19d0b562de
nix flake update 2024-04-28 20:30:37 +10:00
Marien Zwart
c13337d454
Wrap doom CLI
Enough of this now works. In particular, it is possible to run `doom
doctor`.
2024-04-28 20:19:46 +10:00
Marien Zwart
6b8ff7b693
Advice doom-profile-init-file to use our profile
`doom-start` locates the profile init file relative to
`doom-profile-dir` when running interactively, which we customize (either
directly or by setting `doom-profile-data-dir`). But when running
noninteractively, it uses `doom-profile-init-file`, which always loads
relative to `doom-data-dir`.

We cannot point `doom-data-dir` into the store, so this breaks us.

Work around it by advicing `doom-profile-data-dir` to locate the init
file relative to `doom-profile-dir` too. Try to make this more safe by
erroring out if called on a non-default profile.

All of this feels questionable, but I really want `doom doctor` to
work...
2024-04-28 20:11:51 +10:00
Marien Zwart
24ee7b6838
Actually load straight when asked to initialize it
`straight--load-build-cache` is not autoloaded, so we fail if it has not
been loaded yet. Apparently it usually is when we hit this override
interactively, but Doom CLI can call our override early enough we need
this.
2024-04-28 20:09:06 +10:00
Marien Zwart
87267ca824
Make profile loader optional
Not heavily tested, but seems to work.
2024-04-28 18:59:38 +10:00
Marien Zwart
7c5ee461be
Don't force DOOMDIR and DOOMPROFILE* on doomscript
It does not use them (although doomscripts themselves might).

Not forcing them seems more convenient for users (this should let me
test build-profile-loader) and helps me make the profile loader
optional.
2024-04-28 17:54:11 +10:00
Marien Zwart
61839cf1ab
Set DOOMDIR in the wrapper, not the profile loader
Both approaches are about equivalent, but since I'm trying to make the
profile loader optional and there's no way I can make the wrapper
optional, let's move this around...
2024-04-28 17:44:19 +10:00
Marien Zwart
e942e9db3b
Use --subst-var-by (looks nicer) 2024-04-28 17:36:21 +10:00
Marien Zwart
603c36e90c
Simplify setting straight-base-dir
Instead of passing the path down from the profile loader to init.el,
just substitute the path into init.el.

This requires moving DOOMDIR generation into the same derivation as
profile build to avoid a circular dependency.
2024-04-28 17:33:43 +10:00
Marien Zwart
5049ed0665
Clarify Emacs version requirement
And stop forcing pgtk for the example packages.
2024-04-28 16:54:00 +10:00
Marien Zwart
a784fcdbe9
Install doomscript in emacsWithDoom 2024-04-28 16:50:58 +10:00
Marien Zwart
e602ad8bed
Add hack to use non-profile paths
This unsets DOOMPROFILE from inside the profile loader, which should
result in Doom behaving as if we were not using profiles at all.

I'm marking this experimental in part because it feels like a hack, and
in part because this is not sufficient to fix `doom doctor`.
2024-04-28 16:39:50 +10:00
Marien Zwart
2babb2ed6a
Chain-load user init.el instead of embedding it
Mostly to avoid sticking our copyright header on top of the user's
init.el.
2024-04-28 15:23:31 +10:00
Marien Zwart
a4d7407509
Add CONTRIBUTING instructions 2024-04-28 12:48:38 +10:00
Marien Zwart
198f0cb432
Add required disclaimer 2024-04-28 12:34:22 +10:00
Marien Zwart
727bcf40e4
Add LICENSE (and license headers) 2024-04-28 12:26:05 +10:00
Marien Zwart
0b1947effc
Install doomscript
Convenient for testing our build helpers.
2024-04-27 21:41:50 +10:00
Marien Zwart
7d16c1db5e
Whitespace/comment tweaks 2024-04-27 21:34:44 +10:00
Marien Zwart
c09022717d
Pull fetch overrides out of doom.nix
No reason, they just felt out of place.
2024-04-27 21:28:39 +10:00
Marien Zwart
68d5ec704b
Add script to check for byte-compile failures
Just a manual check for now.
2024-04-27 21:25:29 +10:00
Marien Zwart
54c396f24b
Drop unnecessary TODO
Info already works: Doom has `Info-directory-list` in
`doom-autoloads-cached-vars`, which seems to be all that's required.
2024-04-27 20:15:03 +10:00
Marien Zwart
45568feecf
Tweak comment, dropping stale TODO
Buliding an empty autoloads file is harmless. Removing it would only
have been useful if I was able to skip straight.el initialization
entirely: now that I'm storing its build cache it no longer helps.
2024-04-27 20:02:15 +10:00
Marien Zwart
a42fbea20d
Tweak README wording
I was overstating how many packages Doom leaves unpinned.
2024-04-27 19:55:46 +10:00