chore(config): Refactor Emacs configuration with multiple improvements

- Replace projectile with built-in project.el
- Add cal-china-x for Chinese lunar calendar support
- Add dired-gitignore integration with dirvish
- Add mwim for smarter line navigation
- Add keycast mode for key display
- Add ef-themes theme collection
- Improve corfu terminal handling for Emacs 31+
- Add gptel-agent-project and consult-ripgrep-project helpers
- Remove custom.el from repo, support init-local.el for local config
- Update theme faces for transient, keycast, and calendar holidays
- Various keybinding additions and cleanup
This commit is contained in:
User
2026-05-24 11:35:13 +08:00
parent 4024ded7c6
commit ea8d9945fa
20 changed files with 226 additions and 124 deletions

View File

@@ -17,21 +17,6 @@
(or (eq char ?<)
(electric-pair-default-inhibit char))))))
;; 预加载防止windows的org-mode加载卡顿
;; (if *is-windows*
;; (progn (run-with-idle-timer
;; 0.5 nil
;; (lambda ()
;; (with-temp-buffer
;; (org-mode)
;; (org-mode))
;; (message "Org preloaded")))))
;; 设置标题字体大小
;; (with-eval-after-load 'org
;; (dolist (face org-level-faces)
;; (set-face-attribute face nil :height 1)))
;; log默认放入drawer中
(setq org-log-done t)
(setq org-log-into-drawer t)
@@ -98,7 +83,8 @@
:config
(setq denote-journal-directory (expand-file-name "journal" denote-directory))
(setq denote-journal-keyword nil)
(setq denote-journal-signature "journal"))
(setq denote-journal-signature "journal")
(setq denote-journal-keyword "daily"))
;; denote-explore
(use-package denote-explore)
@@ -162,12 +148,12 @@
((org-ql-block-header "Closed TODOs")
(org-super-agenda-groups
'((:auto-ts t)))))))
("qS" "SOMEDAYs"
("qs" "SOMEDAYs"
((org-ql-block '(todo "SOMEDAY")
((org-ql-block-header "SOMEDAYs")
(org-super-agenda-groups
'((:auto-ts t)))))))
("qs" "STARTEDs"
("qS" "STARTEDs"
((org-ql-block '(todo "STARTED")
((org-ql-block-header "STARTEDs")
(org-super-agenda-groups
@@ -293,6 +279,33 @@ See `org-capture-templates' for more information."
;; 自动打开浏览器
(browse-url "http://localhost:1313")))
;; 农历日历
(use-package cal-china-x
:after calendar
:autoload cal-china-x-setup
:init
(cal-china-x-setup)
:config
(setq calendar-mark-holidays-flag t
cal-china-x-important-holidays cal-china-x-chinese-holidays
cal-china-x-general-holidays '((holiday-lunar 1 15 "元宵节")
(holiday-lunar 7 7 "七夕节")
(holiday-fixed 3 8 "妇女节")
(holiday-fixed 3 12 "植树节")
(holiday-fixed 5 4 "青年节")
(holiday-fixed 6 1 "儿童节")
(holiday-fixed 9 10 "教师节"))
holiday-other-holidays '((holiday-fixed 2 14 "情人节")
(holiday-fixed 4 1 "愚人节")
(holiday-fixed 12 25 "圣诞节")
(holiday-fixed 6 7 "高考")
(holiday-float 5 0 2 "母亲节")
(holiday-float 6 0 3 "父亲节")
(holiday-float 11 4 4 "感恩节"))
calendar-holidays (append cal-china-x-important-holidays
cal-china-x-general-holidays
holiday-other-holidays)))
(provide 'init-org)
;;; init-org.el ends here