config

commit 2941a7b712e9bc6c5a26730858c040b3a69790a3
parent 137da69625eb950d3d549be975062ee63b00f29b
Author: dwrz <dwrz@dwrz.net>
Date:   Mon, 11 Dec 2023 13:26:21 +0000

Update Emacs init

Diffstat:
M
emacs/init.el
 | 
18
++++++------------

1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
@@ -140,16 +140,15 @@
   :init
   (add-to-list 'completion-at-point-functions #'cape-abbrev)
   (add-to-list 'completion-at-point-functions #'cape-dabbrev)
-  (add-to-list 'completion-at-point-functions #'cape-file)
   (add-to-list 'completion-at-point-functions #'cape-emoji)
   (add-to-list 'completion-at-point-functions #'cape-dict)
+  (add-to-list 'completion-at-point-functions #'cape-file)
   (add-to-list 'completion-at-point-functions #'cape-keyword)
   (add-to-list 'completion-at-point-functions #'cape-history)
   (add-to-list 'completion-at-point-functions #'cape-sgml)
   (add-to-list 'completion-at-point-functions #'cape-rfc1345)
   (add-to-list 'completion-at-point-functions #'cape-elisp-block)
   (add-to-list 'completion-at-point-functions #'cape-elisp-symbol)
-  (add-to-list 'completion-at-point-functions #'cape-line)
   :ensure t)
 
 (use-package cc-vars :config (setq-default c-basic-offset 8) :ensure nil)
@@ -213,8 +212,6 @@
   ;;        :map minibuffer-local-map
   ;;        ("M-s" . consult-history)                 ;; orig. next-matching-history-element
   ;;        ("M-r" . consult-history))                ;; orig. previous-matching-history-element
-  ;; Enable automatic preview at point in the *Completions* buffer. This is
-  ;; relevant when you use the default completion UI.
   :hook (completion-list-mode . consult-preview-at-point-mode)
   :init
   (setq register-preview-delay 0
@@ -225,9 +222,6 @@
   :config
   ;; Optionally configure preview. The default value
   ;; is 'any, such that any key triggers the preview.
-  ;; (setq consult-preview-key 'any)
-  ;; (setq consult-preview-key "M-.")
-  ;; (setq consult-preview-key '("S-<down>" "S-<up>"))
   ;; For some commands and buffer sources it is useful to configure the
   ;; :preview-key on a per-command basis using the `consult-customize' macro.
   (consult-customize
@@ -236,7 +230,6 @@
    consult-bookmark consult-recent-file consult-xref
    consult--source-bookmark consult--source-file-register
    consult--source-recent-file consult--source-project-recent-file
-   ;; :preview-key "M-."
    :preview-key '(:debounce 0.4 any))
 
   ;; Optionally configure the narrowing key.
@@ -248,6 +241,10 @@
   ;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
   :ensure t)
 
+(use-package consult-lsp :ensure t)
+
+(use-package consult-notmuch :ensure t)
+
 (use-package corfu
   :bind  (:map corfu-map ("RET" . nil))
   :custom
@@ -257,6 +254,7 @@
   (corfu-cycle t)
   (corfu-scroll-margin 0)
   :ensure t
+  :hook (corfu-mode-hook . corfu-popupinfo-mode)
   :init (global-corfu-mode)
   (setq tab-always-indent 'complete))
 
@@ -264,10 +262,6 @@
   :init (unless (display-graphic-p) (corfu-terminal-mode +1))
   :ensure t)
 
-(use-package consult-lsp :ensure t)
-
-(use-package consult-notmuch :ensure t)
-
 (use-package csv-mode :mode "\\.csv\\'" :ensure t)
 
 (use-package css-mode :hook (web-mode . css-mode) :ensure nil)