fix: pin doom-modeline to last all-the-icons supported commit

doom-modeline recently switched from all-the-icons to nerd-icons, but I
cannot get it to render icons correctly. So for now I'm pinning
doom-modeline to the last commit that supported all-the-icons.
This commit is contained in:
2023-05-09 00:46:03 +01:00
parent 3bd155cb79
commit e45fce6685
6 changed files with 55 additions and 37 deletions

View File

@@ -13,7 +13,10 @@
(use-package all-the-icons
:after memoize
:if window-system)
:if window-system
:custom
(all-the-icons-scale-factor 1.0)
(all-the-icons-default-adjust -0.2))
(use-package all-the-icons-ibuffer
:after all-the-icons
@@ -25,7 +28,10 @@
:after all-the-icons
:if window-system
:hook
(dired-mode . all-the-icons-dired-mode))
(dired-mode . all-the-icons-dired-mode)
:custom
(all-the-icons-dired-monochrome nil)
(all-the-icons-dired-v-adjust -0.05))
(use-package treemacs-all-the-icons
:after (all-the-icons treemacs)

View File

@@ -6,24 +6,30 @@
;;; Code:
(use-package doom-modeline
:custom
(doom-modeline-bar-width 3)
(doom-modeline-buffer-encoding nil)
(doom-modeline-buffer-file-name-style 'auto)
(doom-modeline-buffer-modification-icon t)
(doom-modeline-buffer-state-icon t)
(doom-modeline-checker-simple-format t)
(doom-modeline-enable-word-count t)
(doom-modeline-height 25)
(doom-modeline-indent-info nil)
(doom-modeline-minor-modes t)
(doom-modeline-persp-name nil)
(doom-modeline-vcs-max-length 24)
(doom-modeline-workspace-name nil)
(let ((straight-current-profile 'pinned))
;; Pin doom-modeline to before they switched to nerd-icons, and I'm having a
;; number of bugs how nerd icons are rendered.
(straight-x-pin-package "doom-modeline"
"918730eff72e155cfb31b012493a7f425bc48ff8")
:config
(doom-modeline-mode))
(use-package doom-modeline
:custom
(doom-modeline-bar-width 3)
(doom-modeline-buffer-encoding nil)
(doom-modeline-buffer-file-name-style 'auto)
(doom-modeline-buffer-modification-icon t)
(doom-modeline-buffer-state-icon t)
(doom-modeline-checker-simple-format t)
(doom-modeline-enable-word-count t)
(doom-modeline-height 25)
(doom-modeline-indent-info nil)
(doom-modeline-minor-modes t)
(doom-modeline-persp-name nil)
(doom-modeline-vcs-max-length 24)
(doom-modeline-workspace-name nil)
:config
(doom-modeline-mode)))
(provide 'siren-doom-modeline)
;;; siren-doom-modeline.el ends here

View File

@@ -7,16 +7,18 @@
;;; Code:
(use-package nerd-icons
:if (not window-system)
:custom
(nerd-icons-scale-factor 1.0)
(nerd-icons-default-adjust 0.0)
:config
(if (and window-system
(member "Menlo Nerd Font" (font-family-list)))
(setq nerd-nerd-icons-font-family "Menlo Nerd Font")))
(let ((font "Menlo Nerd Font"))
(if (member font (font-family-list))
(setq nerd-nerd-icons-font-family font))))
(use-package nerd-icons-completion
:straight (nerd-icons-completion :type git :host github
:repo "rainstormstudio/nerd-icons-completion")
:after nerd-icons
:straight
(nerd-icons-completion :type git :host github
:repo "rainstormstudio/nerd-icons-completion")
:if (not window-system)
:demand t
:hook
@@ -28,24 +30,22 @@
(use-package nerd-icons-dired
:straight (nerd-icons-dired :type git :host github
:repo "rainstormstudio/nerd-icons-dired")
:after nerd-icons
:if (not window-system)
:hook
(dired-mode . nerd-icons-dired-mode))
(use-package nerd-icons-ibuffer
:after nerd-icons
:if (not window-system)
:hook
(ibuffer-mode . nerd-icons-ibuffer-mode))
(use-package treemacs-nerd-icons
:straight (treemacs-nerd-icons
:type git :host github :repo "rainstormstudio/treemacs-nerd-icons")
:after (nerd-icons treemacs)
:straight (treemacs-nerd-icons :type git :host github
:repo "rainstormstudio/treemacs-nerd-icons")
:if (not window-system)
:config
(treemacs-load-theme "nerd-icons"))
(with-eval-after-load 'treemacs
(treemacs-load-theme "nerd-icons")))
(provide 'siren-nerd-icons)
;;; siren-nerd-icons.el ends here

View File

@@ -7,9 +7,10 @@
;;; Code:
(require 'siren-all-the-icons)
(require 'siren-doom-modeline)
(require 'siren-nerd-icons)
(require 'siren-doom-modeline)
(use-package doom-themes
:custom
;; Global doom-themes options