refactor: improve cross-platform and theme consistency

This commit is contained in:
User
2026-06-09 02:22:56 +08:00
parent b4733718d4
commit 75fff1e3a7
7 changed files with 27 additions and 15 deletions

View File

@@ -117,18 +117,19 @@
trashed-date-format "%Y-%m-%d %H:%M:%S")) trashed-date-format "%Y-%m-%d %H:%M:%S"))
;; discomfort挂载硬盘 ;; discomfort挂载硬盘
(use-package debase (when *is-linux*
(use-package debase
:straight :straight
(debase :type git (debase :type git
:host codeberg :host codeberg
:repo "emacs-weirdware/debase")) :repo "emacs-weirdware/debase"))
(use-package discomfort (use-package discomfort
:commands discomfort :commands discomfort
:straight :straight
(discomfort :type git (discomfort :type git
:host codeberg :host codeberg
:repo "emacs-weirdware/discomfort")) :repo "emacs-weirdware/discomfort")))
(provide 'init-dired) (provide 'init-dired)

View File

@@ -140,13 +140,24 @@
:host github :host github
:repo "emacs-exwm/xdg-launcher") :repo "emacs-exwm/xdg-launcher")
:bind :bind
(("s-SPC" . xdg-launcher-run-app)) (("s-SPC" . xdg-launcher-run-app))
:init :init
(with-eval-after-load 'consult (with-eval-after-load 'consult
(unless (memq 'xdg-launcher-consult-source consult-buffer-sources) (unless (memq 'xdg-launcher-consult-source consult-buffer-sources)
(setq consult-buffer-sources (setq consult-buffer-sources
(append consult-buffer-sources '(xdg-launcher-consult-source))))))) (append consult-buffer-sources '(xdg-launcher-consult-source)))))))
(when *is-mac*
;; launcher
(use-package launcher
:straight
(launcher
:type git
:host github
:repo "xiaoxinghu/launcher.el")
:bind
("s-SPC" . launcher)))
(provide 'init-exwm) (provide 'init-exwm)
;;; init-exwm.el ends here ;;; init-exwm.el ends here

View File

@@ -1,4 +1,4 @@
;;; init.el --- init.el -*- lexical-binding: t -*- ;;; init-prog.el --- programming -*- lexical-binding: t -*-
;;; Commentary: ;;; Commentary:

View File

@@ -100,10 +100,8 @@
(use-package time (use-package time
:if :if
(not *is-android*) (not *is-android*)
:init :hook
(if *is-linux* (persp-mode . display-time-mode)
(add-hook 'exwm-wm-mode-hook 'display-time-mode)
(add-hook 'after-init-hook 'display-time-mode))
:config :config
(setq display-time-default-load-average nil (setq display-time-default-load-average nil
display-time-string-forms display-time-string-forms

View File

@@ -38,6 +38,7 @@
"\\*Edit Annotation.*\\*" "\\*Edit Annotation.*\\*"
"\\*Flutter\\*" "\\*Flutter\\*"
"\\*Ibuffer\\*" "\\*Ibuffer\\*"
"^\\*Finder-"
"Buffers\\*$" "Buffers\\*$"
"^\\*Geiser" "^\\*Geiser"
"\\*gptel-Kimi-Code\\*" "\\*gptel-Kimi-Code\\*"

View File

@@ -59,9 +59,9 @@
`(dired-async-mode-message ((,class (:foreground ,red)))) `(dired-async-mode-message ((,class (:foreground ,red))))
`(dired-async-message ((,class (:foreground ,yellow)))) `(dired-async-message ((,class (:foreground ,yellow))))
`(consult-file ((,class (:foreground ,green)))) `(consult-file ((,class (:foreground ,green))))
`(consult-notes-name ((,class (:foreground ,base01 :weight bold)))) `(consult-notes-name ((,class (:foreground ,base01))))
`(consult-notes-time ((,class (:foreground ,base01 :weight thin)))) `(consult-notes-time ((,class (:foreground ,base01))))
`(consult-notes-size ((,class (:foreground ,base01 :weight thin)))) `(consult-notes-size ((,class (:foreground ,base01))))
`(denote-faces-keywords ((,class (:foreground ,cyan)))) `(denote-faces-keywords ((,class (:foreground ,cyan))))
`(mode-line ((,class (:foreground ,base0 :background ,base02)))) `(mode-line ((,class (:foreground ,base0 :background ,base02))))
`(mode-line-inactive ((,class (:foreground ,base01 :background ,base03)))) `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))

View File

@@ -18,6 +18,7 @@
my-base16-light-core-palette my-base16-light-core-palette
'((custom-theme-set-faces '((custom-theme-set-faces
theme-name theme-name
`(italic ((,class (:slant italic))))
`(org-level-1 ((,class (:foreground ,orange :height 1.0 :weight normal)))) `(org-level-1 ((,class (:foreground ,orange :height 1.0 :weight normal))))
`(org-level-2 ((,class (:foreground ,blue :height 1.0 :weight normal)))) `(org-level-2 ((,class (:foreground ,blue :height 1.0 :weight normal))))
`(org-level-3 ((,class (:foreground ,green :height 1.0 :weight normal)))) `(org-level-3 ((,class (:foreground ,green :height 1.0 :weight normal))))
@@ -58,9 +59,9 @@
`(dired-async-mode-message ((,class (:foreground ,red)))) `(dired-async-mode-message ((,class (:foreground ,red))))
`(dired-async-message ((,class (:foreground ,yellow)))) `(dired-async-message ((,class (:foreground ,yellow))))
`(consult-file ((,class (:foreground ,green)))) `(consult-file ((,class (:foreground ,green))))
`(consult-notes-name ((,class (:foreground ,base01 :weight bold)))) `(consult-notes-name ((,class (:foreground ,base01))))
`(consult-notes-time ((,class (:foreground ,base01 :weight thin)))) `(consult-notes-time ((,class (:foreground ,base01))))
`(consult-notes-size ((,class (:foreground ,base01 :weight thin)))) `(consult-notes-size ((,class (:foreground ,base01))))
`(denote-faces-keywords ((,class (:foreground ,cyan)))) `(denote-faces-keywords ((,class (:foreground ,cyan))))
`(mode-line ((,class (:foreground ,base0 :background ,base02)))) `(mode-line ((,class (:foreground ,base0 :background ,base02))))
`(mode-line-inactive ((,class (:foreground ,base01 :background ,base03)))) `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))