For some reason having these in a with-eval-after-load isn't working, so
let's try this out.
Change-Id: Ia419962626c7bd26776ed6fde977698998a18155
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1998
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI