commit 99ca3c58f3a9dbf90239ccedeb6a192487d9669c
parent 8c39b9a4ecd880a50b959c1f689421b0399d7424
Author: andsy10 <andsy1016@gmail.com>
Date: Thu, 8 Oct 2026 02:01:30 +0800
Update keybindings and custom faces
Diffstat:
5 files changed, 67 insertions(+), 54 deletions(-)
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
@@ -39,9 +39,9 @@
;; built-in packages
(setq straight-built-in-pseudo-packages
(cl-union straight-built-in-pseudo-packages
- '(emacs nadvice python image-mode project xref
- eldoc flymake jsonrpc seq external-completion)
- :test 'equal))
+ '(emacs nadvice python image-mode project xref
+ eldoc flymake jsonrpc seq external-completion)
+ :test 'equal))
(provide 'init-elpa)
;;; init-elpa.el ends here
diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el
@@ -160,13 +160,16 @@
(general-def eww-mode-map
"M-n" #'forward-paragraph
"M-p" #'backward-paragraph
- "p" #'shr-previous-link
- "n" #'shr-next-link
+ "p" #'previous-line
+ "n" #'next-line
"P" #'eww-previous-url
"N" #'eww-next-url
"C-c C-p" #'outline-previous-heading
"C-c C-n" #'outline-next-heading
"C-c C-u" #'outline-up-heading)
+(general-def eww-bookmark-mode-map
+ "p" #'previous-line
+ "n" #'next-line)
;; ghostel
(general-def (ghostel-mode-map
@@ -214,7 +217,8 @@
(general-def ibuffer-mode-map
"h k" #'my-persp-remove-marked-ibuffers
"h A" #'my-persp-set-marked-ibuffers
- "h a" #'my-persp-add-marked-ibuffers)
+ "h a" #'my-persp-add-marked-ibuffers
+ "M-o" #'other-window)
;; ielm
(general-def ielm-map "C-c C-z" #'my-repl-switch-back)
@@ -299,7 +303,11 @@
"d" #'my-vc-annotate-diff-current-revision
"D" #'vc-annotate-show-diff-revision-at-line
"l" #'my-vc-print-log-current-revision
- "L" #'vc-annotate-show-log-revision-at-line)
+ "L" #'vc-annotate-show-log-revision-at-line
+ "M-n" #'vc-annotate-next-revision
+ "M-p" #'vc-annotate-prev-revision
+ "n" #'next-line
+ "p" #'previous-line)
;;; with prefix
@@ -313,7 +321,8 @@
"/" #'cape-dabbrev
"f" #'cape-file
"u" #'cape-rfc1345
- "a" #'cape-abbrev)
+ "a" #'cape-abbrev
+ "l" #'cape-elisp-symbol)
;; d for dired
(general-def
diff --git a/lisp/init-org.el b/lisp/init-org.el
@@ -28,24 +28,19 @@
:config
(defun my-org-tab-complete ()
- (cond ((or (save-excursion
- (beginning-of-line)
- (looking-at-p "[ \t]*#\\+"))
- (looking-back "\\[\\[\\*" 3))
- (let ((completion-at-point-functions '(pcomplete-completions-at-point t)))
- (completion-at-point)))
- ((or (org-at-heading-p)
- (org-in-src-block-p))
- nil)
- ((or (save-excursion
- (backward-sexp)
- (looking-at-p "="))
- (save-excursion
- (backward-sexp)
- (looking-at-p "~")))
- (let ((completion-at-point-functions '(cape-elisp-symbol cape-file t)))
- (completion-at-point)))
- (t nil)))
+ (let ((completion-at-point-functions
+ (cond ((or (save-excursion
+ (beginning-of-line)
+ (looking-at-p "[ \t]*#\\+"))
+ (looking-back "\\[\\[\\*" 3))
+ '(pcomplete-completions-at-point t))
+ ((org-at-heading-p)
+ nil)
+ ((and (org-in-src-block-p)
+ (equal (car (org-babel-get-src-block-info)) "emacs-lisp"))
+ '(cape-elisp-block t))
+ (t nil))))
+ (completion-at-point)))
(add-hook 'org-cycle-tab-first-hook #'my-org-tab-complete)
(defvar org-hide-space-keywords
@@ -270,15 +265,15 @@
(org-agenda-finalize . enable-truncate-lines)
:config
(setq org-agenda-prefix-format '((agenda . " %?-12t% s")
- (todo . " ")
- (tags . " ")
- (search . " ")))
+ (todo . " ")
+ (tags . " ")
+ (search . " ")))
(setq org-agenda-sorting-strategy
- '((agenda time-up scheduled-up deadline-up priority-down category-keep)
- (todo priority-down category-keep)
- (tags priority-down category-keep)
- (search category-keep)))
+ '((agenda time-up scheduled-up deadline-up priority-down category-keep)
+ (todo priority-down category-keep)
+ (tags priority-down category-keep)
+ (search category-keep)))
(setq org-agenda-custom-commands
'(("qd" "TODO entries sort by closed time"
@@ -347,19 +342,19 @@
(use-package org-tree-slide
:init
(defun my-org-tree-slide-start ()
- "Start `org-tree-slide'."
- (interactive)
- (when (eq major-mode 'org-mode)
- (setq-local header-line-format nil
- mode-line-format nil
- cursor-type 'hbar
- olivetti-body-width 100)
- (blink-cursor-mode -1)
- (cnfonts-increase-fontsize 5)
- (hl-line-mode 'toggle)
- (view-mode 1)
- (jinx-mode -1)
- (org-tree-slide-mode 1)))
+ "Start `org-tree-slide'."
+ (interactive)
+ (when (eq major-mode 'org-mode)
+ (setq-local header-line-format nil
+ mode-line-format nil
+ cursor-type 'hbar
+ olivetti-body-width 100)
+ (blink-cursor-mode -1)
+ (cnfonts-increase-fontsize 5)
+ (hl-line-mode 'toggle)
+ (view-mode 1)
+ (jinx-mode -1)
+ (org-tree-slide-mode 1)))
(defun my-org-tree-slide-stop ()
"Stop `org-tree-slide'."
diff --git a/lisp/init-package.el b/lisp/init-package.el
@@ -373,14 +373,14 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
"Append metadata to the entry at point."
(interactive)
(pass--with-closest-entry
- entry
- (call-interactively
- (lambda (field value)
- (interactive
- (let* ((f (completing-read "Field: " my-pass-meta-fields))
- (v (read-string (format "%s: " f))))
- (list f v)))
- (my-password-store-append-field entry field value)))))
+ entry
+ (call-interactively
+ (lambda (field value)
+ (interactive
+ (let* ((f (completing-read "Field: " my-pass-meta-fields))
+ (v (read-string (format "%s: " f))))
+ (list f v)))
+ (my-password-store-append-field entry field value)))))
(defun my-pass-copy-email ()
"Copy email of entry at point to kill ring."
diff --git a/lisp/my-theme.el b/lisp/my-theme.el
@@ -88,6 +88,15 @@
`(shr-h6 ((,class (:inherit outline-6))))
`(shr-code ((,class (:inherit font-lock-comment-face))))
+ `(Info-quoted ((,class (:inherit font-lock-builtin-face))))
+ `(info-title-1 ((,class (:inherit outline-1))))
+ `(info-title-2 ((,class (:inherit outline-2))))
+ `(info-title-3 ((,class (:inherit outline-3))))
+ `(info-title-4 ((,class (:inherit outline-4))))
+
+ `(variable-pitch ((,class (nil))))
+ `(fixed-pitch ((,class (nil))))
+
`(dashboard-footer-face ((,class (:foreground ,blue))))
`(dashboard-text-banner ((,class (:foreground ,green))))
`(dashboard-heading ((,class (:foreground ,green :weight bold))))
