From cc51854eb030dd04e35a1e5895d409b946e38578 Mon Sep 17 00:00:00 2001 From: User Date: Thu, 25 Jun 2026 08:37:52 +0800 Subject: [PATCH] feat: Rename base16 themes to simpler names --- lisp/init-ui.el | 4 ++-- ...-base16-dark-theme.el => my-dark-theme.el} | 20 +++++++++---------- ...ase16-light-theme.el => my-light-theme.el} | 20 +++++++++---------- lisp/{my-base16-palette.el => my-palette.el} | 12 +++++------ 4 files changed, 28 insertions(+), 28 deletions(-) rename lisp/{my-base16-dark-theme.el => my-dark-theme.el} (92%) rename lisp/{my-base16-light-theme.el => my-light-theme.el} (91%) rename lisp/{my-base16-palette.el => my-palette.el} (73%) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index 199c58e..bcc587d 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -20,8 +20,8 @@ (add-hook 'after-make-frame-functions (lambda (frame) (with-selected-frame frame - (load-theme 'my-base16-dark t)))) - (load-theme 'my-base16-dark t))) + (load-theme 'my-dark t)))) + (load-theme 'my-dark t))) ;; 行号 (use-package display-line-numbers diff --git a/lisp/my-base16-dark-theme.el b/lisp/my-dark-theme.el similarity index 92% rename from lisp/my-base16-dark-theme.el rename to lisp/my-dark-theme.el index 2ac1ce1..962d69a 100644 --- a/lisp/my-base16-dark-theme.el +++ b/lisp/my-dark-theme.el @@ -1,21 +1,21 @@ -;;; my-base16-dark-theme.el --- Base16 Dark Theme -*- lexical-binding: t -*- +;;; my-dark-theme.el --- Dark Theme -*- lexical-binding: t -*- ;;; Commentary: -;; A green base16 dark theme base on solarized-theme +;; A green dark theme base on solarized-theme ;;; Code: (require 'solarized) -(require 'my-base16-palette) +(require 'my-palette) (eval-when-compile (require 'solarized-palettes)) -(deftheme my-base16-dark "A Base16 dark theme using Solarized framework.") +(deftheme my-dark "A dark theme using Solarized framework.") (solarized-with-color-variables-with-palette 'dark - 'my-base16-dark - my-base16-dark-core-palette + 'my-dark + my-dark-core-palette '((custom-theme-set-faces theme-name @@ -46,7 +46,7 @@ `(org-block-end-line ((,class (:foreground ,base01 :slant italic)))) `(org-priority ((,class (:foreground ,green :weight bold)))) `(org-checkbox ((,class (:foreground ,base0 :weight bold)))) - `(org-dispatcher-highlight ((,class (:foreground "#c1a059" :background "#253224" :weight bold)))) + `(org-dispatcher-highlight ((,class (:inherit diff-hunk-header :weight bold)))) `(calendar-month-header ((,class (:foreground ,base0 :weight bold)))) `(holiday ((,class (:underline (:style line :color ,yellow))))) @@ -76,7 +76,7 @@ `(dired-async-mode-message ((,class (:foreground ,red)))) `(dired-async-message ((,class (:foreground ,yellow)))) - `(diff-hunk-header ((,class (:foreground "#c1a059" :background "#253224")))) + `(diff-hunk-header ((,class (:foreground ,yellow-1fg :background ,yellow-1bg)))) `(consult-file ((,class (:foreground ,green)))) `(consult-notes-name ((,class (:foreground ,base01)))) @@ -138,6 +138,6 @@ `(syncthing-progress-25 ((,class (:foreground ,orange)))) `(syncthing-progress-0 ((,class (:foreground ,red))))))) -(provide-theme 'my-base16-dark) +(provide-theme 'my-dark) -;;; my-base16-dark-theme.el ends here +;;; my-dark-theme.el ends here diff --git a/lisp/my-base16-light-theme.el b/lisp/my-light-theme.el similarity index 91% rename from lisp/my-base16-light-theme.el rename to lisp/my-light-theme.el index a685d01..5868417 100644 --- a/lisp/my-base16-light-theme.el +++ b/lisp/my-light-theme.el @@ -1,21 +1,21 @@ -;;; my-base16-light-theme.el --- Base16 Light Theme -*- lexical-binding: t -*- +;;; my-light-theme.el --- Light Theme -*- lexical-binding: t -*- ;;; Commentary: -;; A green base16 light theme base on solarized-theme +;; A green light theme base on solarized-theme ;;; Code: (require 'solarized) -(require 'my-base16-palette) +(require 'my-palette) (eval-when-compile (require 'solarized-palettes)) -(deftheme my-base16-light "A Base16 light theme using Solarized framework.") +(deftheme my-light "A light theme using Solarized framework.") (solarized-with-color-variables-with-palette 'light - 'my-base16-light - my-base16-light-core-palette + 'my-light + my-light-core-palette '((custom-theme-set-faces theme-name @@ -46,7 +46,7 @@ `(org-block-end-line ((,class (:foreground ,base01 :slant italic)))) `(org-priority ((,class (:foreground ,green :weight bold)))) `(org-checkbox ((,class (:foreground ,base0 :weight bold)))) - `(org-dispatcher-highlight ((,class (:foreground "#6b561e" :background "#f0e6b8" :weight bold)))) + `(org-dispatcher-highlight ((,class (:inherit diff-hunk-header :weight bold)))) `(calendar-month-header ((,class (:foreground ,base0 :weight bold)))) `(holiday ((,class (:underline (:style line :color ,yellow))))) @@ -76,7 +76,7 @@ `(dired-async-mode-message ((,class (:foreground ,red)))) `(dired-async-message ((,class (:foreground ,yellow)))) - `(diff-hunk-header ((,class (:foreground "#6b561e" :background "#f0e6b8")))) + `(diff-hunk-header ((,class (:foreground ,yellow-1fg :background ,yellow-1bg)))) `(consult-file ((,class (:foreground ,green)))) `(consult-notes-name ((,class (:foreground ,base01)))) @@ -121,6 +121,6 @@ `(proced-uninterruptible-sleep-status-code ((,class (:foreground ,red)))) `(proced-time-colon ((,class (:foreground ,violet))))))) -(provide-theme 'my-base16-light) +(provide-theme 'my-light) -;;; my-base16-light-theme.el ends here +;;; my-light-theme.el ends here diff --git a/lisp/my-base16-palette.el b/lisp/my-palette.el similarity index 73% rename from lisp/my-base16-palette.el rename to lisp/my-palette.el index 7514978..6cdebed 100644 --- a/lisp/my-base16-palette.el +++ b/lisp/my-palette.el @@ -1,11 +1,11 @@ -;;; my-base16-palette.el --- Base16 color palette for solarized -*- lexical-binding: t -*- +;;; my-palette.el --- Color palette for solarized -*- lexical-binding: t -*- ;;; Commentary: -;; Palette of my-base16-theme . +;; Palette of my-theme . ;;; Code: -(defvar my-base16-dark-core-palette +(defvar my-dark-core-palette '("#062624" ; darkest-base: 最深背景 "#E3FCFB" ; brightest-base: 最亮前景 "#A87C04" ; yellow: 黄色 @@ -17,7 +17,7 @@ "#01928D" ; cyan: 青色 "#3A9C36")) ; green: 绿色 -(defvar my-base16-light-core-palette +(defvar my-light-core-palette '("#051E23" ; darkest-base: 最深背景 "#FCFFDE" ; brightest-base: 最亮前景 "#A87C04" ; yellow: 黄色 @@ -29,6 +29,6 @@ "#01928D" ; cyan: 青色 "#3A9C36")) ; green: 绿色 -(provide 'my-base16-palette) +(provide 'my-palette) -;;; my-base16-palette.el ends here +;;; my-palette.el ends here