feat: Rename base16 themes to simpler names

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-dark t))))
-    (load-theme 'my-base16-dark t)))
+    (load-theme 'my-dark t)))
 
 ;; 行号
 (use-package display-line-numbers

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-dark
-  my-base16-dark-core-palette
+  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

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-light
-  my-base16-light-core-palette
+  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

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