emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: updating from latest

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-02-25 10:17:20 -05:00
commit 50b536b3aa
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lisp/doom-ui.el
View file

@ -524,18 +524,24 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(fixed-pitch . ,doom-font) (fixed-pitch . ,doom-font)
(fixed-pitch-serif . ,doom-serif-font) (fixed-pitch-serif . ,doom-serif-font)
(variable-pitch . ,doom-variable-pitch-font))) (variable-pitch . ,doom-variable-pitch-font)))
(when-let* ((face (car map)) (condition-case e
(font (cdr map))) (when-let* ((face (car map))
(dolist (frame (frame-list)) (font (cdr map)))
(when (display-multi-font-p frame) (dolist (frame (frame-list))
(set-face-attribute face frame (when (display-multi-font-p frame)
:width 'normal :weight 'normal (set-face-attribute face frame
:slant 'normal :font font))) :width 'normal :weight 'normal
(let ((new-specs (doom--make-font-specs face font))) :slant 'normal :font font)))
;; Don't save to `customized-face' so it's omitted from `custom-file' (let ((new-specs (doom--make-font-specs face font)))
;;(put face 'customized-face new-specs) ;; Don't save to `customized-face' so it's omitted from `custom-file'
(custom-push-theme 'theme-face face 'user 'set new-specs) ;;(put face 'customized-face new-specs)
(put face 'face-modified nil)))) (custom-push-theme 'theme-face face 'user 'set new-specs)
(put face 'face-modified nil)))
('error
(ignore-errors (doom--reset-inhibited-vars-h))
(if (string-prefix-p "Font not available" (error-message-string e))
(signal 'doom-font-error (list (font-get (cdr map) :family)))
(signal (car e) (cdr e))))))
(when (fboundp 'set-fontset-font) (when (fboundp 'set-fontset-font)
(let* ((fn (doom-rpartial #'member (font-family-list))) (let* ((fn (doom-rpartial #'member (font-family-list)))
(symbol-font (or doom-symbol-font (symbol-font (or doom-symbol-font

11
modules/ui/doom/config.el
View file

@ -10,11 +10,12 @@
:hook (doom-load-theme . doom-themes-org-config) :hook (doom-load-theme . doom-themes-org-config)
:init (setq doom-theme 'doom-one) :init (setq doom-theme 'doom-one)
;; more Atom-esque file icons for neotree/treemacs ;; more Atom-esque file icons for neotree/treemacs
(when (modulep! :ui neotree) ;; (when (modulep! :ui neotree)
(add-hook 'doom-load-theme-hook #'doom-themes-neotree-config) ;; (add-hook 'doom-load-theme-hook #'doom-themes-neotree-config)
(setq doom-themes-neotree-enable-variable-pitch t ;; (setq doom-themes-neotree-enable-variable-pitch t
doom-themes-neotree-file-icons 'simple ;; doom-themes-neotree-file-icons 'simple
doom-themes-neotree-line-spacing 2))) ;; doom-themes-neotree-line-spacing 2))
)
(use-package! solaire-mode (use-package! solaire-mode