diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el index ede2065..e678a76 100644 --- a/lisp/init-kbd.el +++ b/lisp/init-kbd.el @@ -127,7 +127,9 @@ "" 'dired-find-file "" 'dired-up-directory "C-f" 'dired-find-file - "" 'dirvish-layout-toggle) + "" 'dirvish-layout-toggle + "C-s" 'consult-line + "C-r" 'consult-line) ;; magit (general-def magit-mode-map diff --git a/lisp/init-package.el b/lisp/init-package.el index 05e4e88..7878f13 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -330,13 +330,16 @@ targets." ;; god-mode,模态编辑 (use-package god-mode :config + (which-key-enable-god-mode-support) (setq god-mode-enable-function-key-translation nil) - (defun god-mode-enable-relative-line-numbers () - (if god-local-mode - (setq display-line-numbers 'relative) - (setq display-line-numbers t))) - (add-hook 'god-local-mode-hook #'god-mode-enable-relative-line-numbers) + (defun my-sync-line-numbers-with-god-mode () + (let ((desired (if (bound-and-true-p god-local-mode) + 'relative + t))) + (unless (or (eq display-line-numbers desired) (bound-and-true-p olivetti-mode)) + (setq display-line-numbers desired)))) + (add-hook 'post-command-hook #'my-sync-line-numbers-with-god-mode) (setq god-exempt-major-modes (delete-dups (append '(diff-mode exwm-mode) god-exempt-major-modes))))