From ea9e3da60b1f265c794cc180def05b7f6ec855c9 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 29 Apr 2026 11:26:01 +0800 Subject: [PATCH] Config: add light version of my-base16 theme. --- custom.el | 47 ----------------------------------- lisp/init-kbd.el | 5 ++-- lisp/init-org.el | 5 ++-- lisp/my-base16-dark-theme.el | 3 +++ lisp/my-base16-light-theme.el | 45 +++++++++++++++++++++++++++++++++ lisp/my-base16-palette.el | 12 +++++++++ 6 files changed, 66 insertions(+), 51 deletions(-) create mode 100644 lisp/my-base16-light-theme.el diff --git a/custom.el b/custom.el index dbb489b..0f48c6a 100644 --- a/custom.el +++ b/custom.el @@ -4,53 +4,6 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(org-agenda-files - '("/home/trogloxene/org/my-org-note/20260422-guile小本本.org" - "/home/trogloxene/org/my-org-daily/2026-03-21.org" - "/home/trogloxene/org/my-org-daily/2026-03-22.org" - "/home/trogloxene/org/my-org-daily/2026-03-23.org" - "/home/trogloxene/org/my-org-daily/2026-03-24.org" - "/home/trogloxene/org/my-org-daily/2026-03-25.org" - "/home/trogloxene/org/my-org-daily/2026-03-26.org" - "/home/trogloxene/org/my-org-daily/2026-03-27.org" - "/home/trogloxene/org/my-org-daily/2026-03-28.org" - "/home/trogloxene/org/my-org-daily/2026-03-29.org" - "/home/trogloxene/org/my-org-daily/2026-03-30.org" - "/home/trogloxene/org/my-org-daily/2026-03-31.org" - "/home/trogloxene/org/my-org-daily/2026-04-01.org" - "/home/trogloxene/org/my-org-daily/2026-04-02.org" - "/home/trogloxene/org/my-org-daily/2026-04-03.org" - "/home/trogloxene/org/my-org-daily/2026-04-04.org" - "/home/trogloxene/org/my-org-daily/2026-04-05.org" - "/home/trogloxene/org/my-org-daily/2026-04-06.org" - "/home/trogloxene/org/my-org-daily/2026-04-07.org" - "/home/trogloxene/org/my-org-daily/2026-04-08.org" - "/home/trogloxene/org/my-org-daily/2026-04-09.org" - "/home/trogloxene/org/my-org-daily/2026-04-10.org" - "/home/trogloxene/org/my-org-daily/2026-04-11.org" - "/home/trogloxene/org/my-org-daily/2026-04-12.org" - "/home/trogloxene/org/my-org-daily/2026-04-13.org" - "/home/trogloxene/org/my-org-daily/2026-04-14.org" - "/home/trogloxene/org/my-org-daily/2026-04-15.org" - "/home/trogloxene/org/my-org-daily/2026-04-17.org" - "/home/trogloxene/org/my-org-daily/2026-04-18.org" - "/home/trogloxene/org/my-org-daily/2026-04-19.org" - "/home/trogloxene/org/my-org-daily/2026-04-20.org" - "/home/trogloxene/org/my-org-daily/2026-04-21.org" - "/home/trogloxene/org/my-org-daily/2026-04-22.org" - "/home/trogloxene/org/my-org-note/20260407-org-mode简明手册笔记.org" - "/home/trogloxene/org/my-org-note/20260408-怎么管理org-mode笔记.org" - "/home/trogloxene/org/my-org-note/20260408-成为emacs高手.org" - "/home/trogloxene/org/my-org-note/20260408-成为guix高手的第一天.org" - "/home/trogloxene/org/my-org-note/20260409-elisp小本本.org" - "/home/trogloxene/org/my-org-note/20260409-精选emacs package.org" - "/home/trogloxene/org/my-org-note/20260410-Interview with an Emacs Enthusiast excerpt.org" - "/home/trogloxene/org/my-org-note/20260412-steam备用码_记得加密.org" - "/home/trogloxene/org/my-org-note/20260414-怎样让git仓库使用ssh.org" - "/home/trogloxene/org/my-org-note/20260415-learn scheme in 15 minutes.org" - "/home/trogloxene/org/my-org-note/20260415-折腾guix干什么.org" - "/home/trogloxene/org/my-org-note/20260416-配置一下gptel.org" - "/home/trogloxene/org/my-org-note/20260421-成为exwm高手的第一天.org")) '(package-selected-packages '(ace-window benchmark-init cape cnfonts corfu crux drag-stuff eglot embark-consult everything exec-path-form-shell gcmh hungry-delete marginalia multiple-cursors orderless diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el index e130038..248dfa0 100644 --- a/lisp/init-kbd.el +++ b/lisp/init-kbd.el @@ -123,7 +123,7 @@ ;; vterm (general-def vterm-mode-map "M-]" nil - "C-x C-x" 'vterm-send-C-x) + "C-q" 'vterm-send-next-key) ;; embark (general-def embark-file-map @@ -142,7 +142,8 @@ (general-def org-mode-map "C-" 'org-cycle-current-subtree "C-c i" 'consult-org-heading - "C-c o w" 'my-org-refile-to-new-file) + "C-c o w" 'my-org-refile-to-new-file + "C-c o l" 'org-toggle-link-display) ;; emms (general-def emms-playlist-mode-map diff --git a/lisp/init-org.el b/lisp/init-org.el index 3da9c3e..528891c 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -29,8 +29,9 @@ (message "Org preloaded"))))) ;; 设置标题字体大小 -;; (dolist (face org-level-faces) -;; (set-face-attribute face nil :height 1)) +;; (with-eval-after-load 'org +;; (dolist (face org-level-faces) +;; (set-face-attribute face nil :height 1))) ;; log默认放入drawer中 (setq org-log-done t) diff --git a/lisp/my-base16-dark-theme.el b/lisp/my-base16-dark-theme.el index 461383b..3c890f6 100644 --- a/lisp/my-base16-dark-theme.el +++ b/lisp/my-base16-dark-theme.el @@ -24,7 +24,10 @@ `(org-level-8 ((,class (:foreground ,blue)))) `(org-done ((,class (:foreground ,green :weight bold)))) `(org-headline-done ((,class (:foreground ,green)))) + `(org-block-begin-line ((,class (:foreground ,base01 :underline t :slant italic :extend t)))) + `(org-block-end-line ((,class (:foreground ,base01 :overline t :slant italic :extend t)))) `(org-priority ((,class (:foreground ,green :weight bold)))) + `(org-checkbox ((,class (:foreground ,base0 :weight bold)))) `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold)))) `(font-lock-doc-face ((,class (:foreground ,green :slant normal)))) `(font-lock-string-face ((,class (:foreground ,green)))) diff --git a/lisp/my-base16-light-theme.el b/lisp/my-base16-light-theme.el new file mode 100644 index 0000000..919d156 --- /dev/null +++ b/lisp/my-base16-light-theme.el @@ -0,0 +1,45 @@ +;;; my-base16-light-theme.el --- Base16 Light Theme -*- lexical-binding: t -*- + +;;; Commentary: +;; A green base16 light theme base on solarized-theme + +;;; Code: + +(require 'solarized) +(require 'my-base16-palette) +(eval-when-compile + (require 'solarized-palettes)) + +(deftheme my-base16-light "A Base16 light theme using Solarized framework.") + +(solarized-with-color-variables-with-palette + 'light + 'my-base16-light + my-base16-light-core-palette + '((custom-theme-set-faces + theme-name + `(org-level-2 ((,class (:foreground ,green :height 1.05)))) + `(org-level-3 ((,class (:foreground ,blue)))) + `(org-level-6 ((,class (:foreground ,green)))) + `(org-level-8 ((,class (:foreground ,blue)))) + `(org-done ((,class (:foreground ,green :weight bold)))) + `(org-headline-done ((,class (:foreground ,green)))) + `(org-block-begin-line ((,class (:foreground ,base01 :underline t :slant italic :extend t)))) + `(org-block-end-line ((,class (:foreground ,base01 :overline t :slant italic :extend t)))) + `(org-priority ((,class (:foreground ,green :weight bold)))) + `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold)))) + `(font-lock-doc-face ((,class (:foreground ,green :slant normal)))) + `(font-lock-string-face ((,class (:foreground ,green)))) + `(dashboard-footer-face ((,class (:foreground ,blue)))) + `(dashboard-text-banner ((,class (:foreground ,green)))) + `(dashboard-heading ((,class (:foreground ,green :weight bold)))) + `(dirvish-file-time ((,class (:foreground ,base01)))) + `(dired-header ((,class (:foreground ,green)))) + `(mode-line ((,class (:foreground ,base0 :background ,base02)))) + `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03)))) + `(jinx-misspelled ((,class (:underline (:style dashes :color ,yellow))))) + `(vertico-current ((,class (:background ,base02 :extend t :underline nil))))))) + +(provide-theme 'my-base16-light) + +;;; my-base16-light-theme.el ends here diff --git a/lisp/my-base16-palette.el b/lisp/my-base16-palette.el index 1f43e68..7beecb6 100644 --- a/lisp/my-base16-palette.el +++ b/lisp/my-base16-palette.el @@ -17,6 +17,18 @@ "#01928D" ; cyan: 青色 "#3A9C36")) ; green: 绿色 +(defvar my-base16-light-core-palette + '("#062617" ; darkest-base: 最深背景 + "#E3FFE6" ; brightest-base: 最亮前景 + "#A87C04" ; yellow: 黄色 + "#C24713" ; orange: 橙色 + "#CE2825" ; red: 红色 + "#d33682" ; magenta: 品红 + "#6c71c4" ; violet: 紫罗兰 + "#2570CD" ; blue: 蓝色 + "#01928D" ; cyan: 青色 + "#3A9C36")) ; green: 绿色 + (provide 'my-base16-palette) ;;; my-base16-palette.el ends here