From 69eaf50f5e28ae73812b76f34d26ddff221e2455 Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Sat, 21 Feb 2026 03:41:32 +1100 Subject: [PATCH] Update --- lisp/init-completion.el | 35 ++++++++++++++++++++++++++++++++++- lisp/init-ui.el | 8 ++++---- lisp/init-utils.el | 5 +++-- lisp/init-window.el | 5 ----- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 1bf7339..c3d6457 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -187,7 +187,40 @@ ("M-." . my-embark-preview)) :init ;; Optionally replace the key help with a completing-read interface - (setq prefix-help-command #'embark-prefix-help-command)) + (setq prefix-help-command #'embark-prefix-help-command) + :config + (eval-when-compile + (defmacro my/embark-ace-action (fn) + `(defun ,(intern (concat "my/embark-ace-" (symbol-name fn))) () + (interactive) + (with-demoted-errors "%s" + (require 'ace-window) + (let ((aw-dispatch-always t)) + (aw-switch-to-window (aw-select nil)) + (call-interactively (symbol-function ',fn))))))) + + (define-key embark-file-map (kbd "o") (my/embark-ace-action find-file)) + (define-key embark-buffer-map (kbd "o") (my/embark-ace-action switch-to-buffer)) + (define-key embark-bookmark-map (kbd "o") (my/embark-ace-action bookmark-jump)) + (eval-when-compile + (defmacro my/embark-split-action (fn split-type) + `(defun ,(intern (concat "my/embark-" + (symbol-name fn) + "-" + (car (last (split-string + (symbol-name split-type) "-"))))) () + (interactive) + (funcall #',split-type) + (call-interactively #',fn)))) + + (define-key embark-file-map (kbd "2") (my/embark-split-action find-file split-window-below)) + (define-key embark-buffer-map (kbd "2") (my/embark-split-action switch-to-buffer split-window-below)) + (define-key embark-bookmark-map (kbd "2") (my/embark-split-action bookmark-jump split-window-below)) + + (define-key embark-file-map (kbd "3") (my/embark-split-action find-file split-window-right)) + (define-key embark-buffer-map (kbd "3") (my/embark-split-action switch-to-buffer split-window-right)) + (define-key embark-bookmark-map (kbd "3") (my/embark-split-action bookmark-jump split-window-right))) + (use-package embark-consult :bind (:map minibuffer-mode-map ("C-c C-o" . embark-export)) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index 823fc27..8bf9eee 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -62,7 +62,8 @@ (pcase system-type ('darwin ; macOS (set-face-attribute 'default nil :font "Sarasa Term SC-20") ; 20 * 1.5 - ;; (set-face-attribute 'variable-pitch nil :font "Bookerly-18" :weight 'light) + (set-face-attribute 'variable-pitch nil :font "Bookerly-18" :weight 'light) + (set-face-attribute 'fixed-pitch nil :font "Sarasa Term SC-20") (add-to-list 'default-frame-alist '(height . 53)) (add-to-list 'default-frame-alist '(width . 120))) @@ -72,9 +73,8 @@ (add-to-list 'default-frame-alist '(height . 40)) (add-to-list 'default-frame-alist '(width . 90)))) -;; (use-package mixed-pitch - ;; :hook text-mode - ;; :hook org-mode) +(use-package mixed-pitch + :hook org-mode) (use-package diff-hl :init (global-diff-hl-mode)) diff --git a/lisp/init-utils.el b/lisp/init-utils.el index 5bf7479..fd32127 100644 --- a/lisp/init-utils.el +++ b/lisp/init-utils.el @@ -33,9 +33,10 @@ 'grep-find-template "rg --color=auto --null -nH --no-heading -e "))) (use-package pdf-tools - :init + :config (pdf-tools-install)) - +(use-package keycast + :hook (elpaca-after-init . keycast-mode-line-mode)) (provide 'init-utils) diff --git a/lisp/init-window.el b/lisp/init-window.el index 11b334a..7be583f 100644 --- a/lisp/init-window.el +++ b/lisp/init-window.el @@ -141,11 +141,6 @@ "\\*rustfmt\\*$" rustic-compilation-mode rustic-cargo-clippy-mode rustic-cargo-outdated-mode rustic-cargo-run-mode rustic-cargo-test-mode "\\*haskell\\*")) - (add-to-list 'display-buffer-alist - '("\\.pdf\\'" - (display-buffer-reuse-window display-buffer-in-direction) - (direction . right) - (window-width . 0.5))) (add-to-list 'display-buffer-alist '("\\*OCaml\\*" (display-buffer-reuse-window display-buffer-in-direction)