From 9e22c512b52de3420a74614ca75d4027c3aace1f Mon Sep 17 00:00:00 2001 From: William Carroll Date: Thu, 6 Jan 2022 14:09:20 -0800 Subject: fix(wpcarro/emacs): Temporarily prefer Monospace to JetBrainsMono When I migrated to /depot I removed JetBrainsMono from my monorepo. This is fine on NixOS machines because I'm depending on JetBrainsMono through Nix configuration. But for non-NixOS machines (my work machines), I cannot do this. Until I've thought of how I'd like to support this, I'm doing to use Monospace, which should be available on all of my machines. Change-Id: Icd0cd641526246d40b8d971907c63c7f32ef1c3d Reviewed-on: https://cl.tvl.fyi/c/depot/+/4821 Tested-by: BuildkiteCI Reviewed-by: wpcarro --- users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'users') diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el index dc35725f25..2f7654423c 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el @@ -162,16 +162,16 @@ ;; during initialization? (when (device-laptop?) (laptop-battery-display)) -(if window-system - (progn - (fonts-whitelist-set "JetBrainsMono") - (colorscheme-whitelist-set 'doom-one-light) - ;; the doom-acario-dark theme uses "Monospace Serif" as the font for - ;; comments, and I'd prefer JetBrainsMono (no italics). - (set-face-attribute font-lock-comment-face nil - :family "JetBrainsMono" - :slant 'normal)) - (load-theme 'wombat)) +(colorscheme-whitelist-set 'doom-one-light) + +(when window-system + (let ((font "Monospace")) + (fonts-whitelist-set font) + ;; Some themes (e.g. doom-acario-*) change the font for comments. This + ;; should prevent that. + (set-face-attribute font-lock-comment-face nil + :family font + :slant 'normal))) (modeline-setup) -- cgit 1.4.1