commit 9731f91f65dd2a55f802e24780be664a75716ac6
parent 1347deef869a655f2485723b86dd9c3e49c49639
Author: andsy10 <andsy1016@gmail.com>
Date: Sat, 1 Aug 2026 21:34:13 +0800
Tidy and reorganize config
Diffstat:
7 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/lisp/init-base.el b/lisp/init-base.el
@@ -111,33 +111,15 @@
("App" (mode . exwm-mode))
("Scratch" (or
(name . "^*scratch")))
- ("Tramp"(or
- (name . "^\\*tramp")))
- ("eww" (or
- (mode . eww-mode)
- (mode . eww-bookmark-mode)
- (mode . eww-buffers-mode)
- (mode . eww-history-mode)))
- ("AI" (or
- (name . "^\\*OpenCode")
- (name . "\\*opencode-serve\\*")
- (name . "^\\*gptel")))
- ("Calc" (or
- (mode . calc-mode)
- (mode . calc-trail-mode)))
("Text" (or
(mode . org-mode)
(mode . markdown-mode)
+ (filename . ".\\.md")
(name . "^\\*\\[D\\] FILE backlinks for")))
- ("Shell" (or
- (mode . eshell-mode)
- (mode . ghostel-mode)
- (mode . vterm-mode)))
("Scripts" (or
(mode . shell-script-mode)
(mode . shell-mode)
(mode . sh-mode)
- (mode . lua-mode)
(mode . bat-mode)))
("Config" (or
(mode . conf-mode)
@@ -169,11 +151,12 @@
(mode . sly-mrepl-mode)
(name . "\\*sly-compilation\\*")
(name . "^\\*img-cache\\*")))
- ("Help" (or
- (mode . help-mode)
- (mode . helpful-mode)))
- ("Info" (or
- (name . "^\\*info")))
+ ("Shell" (or
+ (mode . eshell-mode)
+ (mode . ghostel-mode)
+ (mode . vterm-mode)))
+ ("Tramp"(or
+ (name . "^\\*tramp")))
("Magit" (or
(mode . magit-blame-mode)
(mode . magit-cherry-mode)
@@ -187,6 +170,26 @@
(mode . dired-mode)
(name . "^*dirvish")
(mode . trashed-mode)))
+ ("eww" (or
+ (mode . eww-mode)
+ (mode . eww-bookmark-mode)
+ (mode . eww-buffers-mode)
+ (mode . eww-history-mode)))
+ ("Feeds" (or
+ (name . "\\*elfeed-")))
+ ("AI" (or
+ (name . "^\\*OpenCode")
+ (name . "\\*opencode-serve\\*")
+ (name . "^\\*gptel")
+ (name . "^\\*pi-coding-agent")))
+ ("Calc" (or
+ (mode . calc-mode)
+ (mode . calc-trail-mode)))
+ ("Help" (or
+ (mode . help-mode)
+ (mode . helpful-mode)
+ (mode . man-mode)
+ (mode . info-mode)))
("Grep" (or
(mode . grep-mode)
(mode . rg-mode)
diff --git a/lisp/init-completion.el b/lisp/init-completion.el
@@ -50,8 +50,8 @@
"^PREVIEW"
"^\\*helpful"
"^\\*Help"
- "Diff"
- "straight"
+ "^\\*Diff"
+ "^\\*straight"
"\\*Messages\\*"
"\\*Chinese-word-segmentation\\*"
"\\*gptel-reasoning\\*"
diff --git a/lisp/init-edit.el b/lisp/init-edit.el
@@ -94,13 +94,7 @@
(cl-union '(diff-mode exwm-mode) god-exempt-major-modes :test 'equal)
god-mode-lighter-string "THANK-GOD-MODE")
- (defun my-sync-god-mode-lighter-face (&rest _)
- (set-face-attribute 'god-mode-lighter nil
- :inherit 'isearch-fail
- :background (face-attribute 'mode-line :background nil t)
- :weight 'bold))
- (my-sync-god-mode-lighter-face)
- (add-hook 'enable-theme-functions #'my-sync-god-mode-lighter-face)
+ (custom-set-faces '(god-mode-lighter ((t (:inherit error :weight bold)))))
(defun my-sync-line-numbers-with-god-mode ()
(let ((desired (if (bound-and-true-p god-local-mode)
diff --git a/lisp/init-gptel.el b/lisp/init-gptel.el
@@ -88,9 +88,9 @@ explanations, no quotes, no punctuation, no file extension."
(generated (if (string-empty-p generated)
"gptel-session"
generated))
- (timestamp (format-time-string "%Y%m%d-%H%M%S"))
+ (timestamp (format-time-string "%Y%m%dT%H%M%S"))
(dir (expand-file-name "~/gptel/sessions/"))
- (base (concat timestamp "-" generated))
+ (base (concat timestamp "--" generated))
(file (expand-file-name (concat base ".org") dir)))
;; handle name collision
(when (file-exists-p file)
diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el
@@ -313,7 +313,9 @@
"a" 'org-agenda
"l" 'org-store-link
"k" 'comment-line
- "K" 'comment-kill)
+ "K" 'comment-kill
+ "v" 'scroll-other-window
+ "M-v" 'scroll-other-window-down)
;; global map
(general-def
@@ -380,7 +382,8 @@
;; other
"C-x r b" 'consult-bookmark
- "C-;" 'embark-act)
+ "C-;" 'embark-act
+ "M-s M-b" 'eww-list-bookmarks)
(cond
(*is-android*
diff --git a/lisp/init-ui.el b/lisp/init-ui.el
@@ -50,10 +50,6 @@
;; rainbow-delimiters
(use-package rainbow-delimiters)
-;; some themes
-(use-package naysayer-theme)
-(use-package ef-themes)
-
(if *is-android*
(use-package simple-modeline
:hook
diff --git a/lisp/init-window.el b/lisp/init-window.el
@@ -48,9 +48,6 @@
"^\\*sly"
"^magit"
"\\*discomfort\\*"
- "\\*eww bookmarks\\*"
- "\\*eww history\\*"
- "\\*Proced\\*"
bookmark-bmenu-mode
lsp-bridge-ref-mode
comint-mode
