From 38051817cc0d3e8d299190db70507d1bf84f9a78 Mon Sep 17 00:00:00 2001
From: Luigi Sartor Piucco <luigipiucco@gmail.com>
Date: Sat, 24 Sep 2022 17:33:32 -0300
Subject: [PATCH 1/5] module: add :completion corfu

This commit's primary goal is allowing use of
[minad/corfu](https://github.com/minad/corfu) as an alternative to
[company](https://github.com/company-mode/company-mode). It introduces a
module under :completion for this purpose, plus some conditionals on
other relevant modules to toggle functionality like lsp back-ends and
[minad/cape](https://github.com/minad/cape) capfs for certain modes.

Other optional or miscellaneous features include:

- Support for displaying the completion's documentation on a secondary
  popup;
- Support for terminal display if :os tty;
- Support for icons if +icons;
- Support for tab-and-go completion if +tng;
---
 modules/completion/corfu/README.org    | 155 +++++++++++++++++++++++++
 modules/completion/corfu/autoload.el   |  10 ++
 modules/completion/corfu/config.el     | 122 +++++++++++++++++++
 modules/completion/corfu/packages.el   |  11 ++
 modules/completion/vertico/packages.el |   2 +-
 modules/tools/lsp/+lsp.el              |   5 +-
 6 files changed, 303 insertions(+), 2 deletions(-)
 create mode 100644 modules/completion/corfu/README.org
 create mode 100644 modules/completion/corfu/autoload.el
 create mode 100644 modules/completion/corfu/config.el
 create mode 100644 modules/completion/corfu/packages.el

diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org
new file mode 100644
index 000000000..f300bde8c
--- /dev/null
+++ b/modules/completion/corfu/README.org
@@ -0,0 +1,155 @@
+#+title:    :completion corfu
+#+subtitle: Complete with cap(f), cape and a flying feather
+#+created:  September 9, 2022
+#+since:    3.0.0 (#7002)
+
+* Description :unfold:
+This module provides code completion, powered by [[doom-package:corfu]].
+
+It is recommended to enable either this or [[doom-module::completion company]], in
+case you desire pre-configured auto-completion. Corfu is much lighter weight and
+focused, plus it's built on native Emacs functionality, whereas company is heavy
+and highly non-native, but has some extra features and more maturity.
+
+** Maintainers
+- [[doom-user:][@LuigiPiucco]]
+
+[[doom-contrib-maintainer:][Become a maintainer?]]
+
+** Module flags
+- +icons ::
+  Display icons beside completion suggestions.
+- +tng ::
+  Known as Tab'n'Go to Company users, changes behavior to invoke completion on
+  [[kbd:][TAB]]. When Corfu is active, [[kbd:][TAB]] and [[kbd:][S-TAB]] will navigate the completion
+  candidates. Arrow keys and evil-style movement are still supported.
+- +orderless ::
+  Pull in [[doom-package:orderless]] if necessary and apply multi-component
+  completion (still needed if [[doom-module::completion vertico]] is active).
+
+** Packages
+- [[doom-package:corfu]]
+- [[doom-package:cape]]
+- [[doom-package:nerd-icons-corfu]] if [[doom-module::completion corfu +icons]]
+- [[doom-package:orderless]] if [[doom-module::completion corfu +orderless]]
+- [[doom-package:corfu-terminal]] if [[doom-module::os tty]]
+
+** Hacks
+/No hacks documented for this module./
+
+** TODO Changelog
+# This section will be machine generated. Don't edit it by hand.
+/This module does not have a changelog yet./
+
+* Installation
+Enable this module in your ~doom!~ block.
+
+This module has no direct requirements, but some languages may have their own
+requirements to fulfill before you get code completion in them (and some
+languages may lack code completion support altogether). Run ~$ doom doctor~ to
+find out if you're missing any dependencies. Note that Corfu may have support
+for completions in languages that have no development intelligence, since it
+supports generic, context insensitive candidates such as file names or recurring
+words.
+
+* TODO Usage
+#+begin_quote
+ 🔨 /This module's usage documentation is incomplete./ [[doom-contrib-module:][Complete it?]]
+#+end_quote
+
+** Code completion
+By default, completion gets triggered after typing 2 non-space consecutive
+characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup
+is visible, the following relevant keys are available:
+
+| Keybind  | Description                                                      |
+|----------+------------------------------------------------------------------|
+| [[kbd:][<down>]]   | Go to next candidate                                             |
+| [[kbd:][<up>]]     | Go to previous candidate                                         |
+| [[kbd:][C-n]]      | Go to next candidate                                             |
+| [[kbd:][C-p]]      | Go to previous candidate                                         |
+| [[kbd:][C-j]]      | (evil) Go to next candidate                                      |
+| [[kbd:][C-k]]      | (evil) Go to previous candidate                                  |
+| [[kbd:][C-<down>]] | Go to next doc line                                              |
+| [[kbd:][C-<up>]]   | Go to previous doc line                                          |
+| [[kbd:][C-S-n]]    | Go to next doc line                                              |
+| [[kbd:][C-S-p]]    | Go to previous doc line                                          |
+| [[kbd:][C-S-j]]    | (evil) Go to next doc line                                       |
+| [[kbd:][C-S-k]]    | (evil) Go to previous doc line                                   |
+| [[kbd:][C-h]]      | Toggle documentation (if available)                              |
+| [[kbd:][M-m]]      | Export to minibuffer (if [[doom-module::completion vertico]])        |
+| [[kbd:][M-S-j]]    | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) |
+| [[kbd:][RET]]      | Insert candidate                                                 |
+| [[kbd:][SPC]]      | (after wildcard) Reset completion                                |
+| [[kbd:][DEL]]      | Reset completion                                                 |
+| [[kbd:][C-SPC]]    | Complete (unless [[doom-module::completion corfu +tng]])             |
+| [[kbd:][C-SPC]]    | (when completing) Insert separator DWIM (see below)              |
+
+If you prefer a [[kbd:][TAB]]-centric completion style, enable the [[doom-module::completion
+corfu +tng]] flag so that, instead, you trigger completion with [[kbd:][TAB]], getting the
+following additional binds:
+
+| Keybind | Description                                   |
+|---------+-----------------------------------------------|
+| [[kbd:][TAB]]     | Complete                                      |
+| [[kbd:][TAB]]     | (when completing) Go to next candidate        |
+| [[kbd:][S-TAB]]   | (when completing) Go to previous candidate    |
+
+** Searching with multiple keywords
+If the [[doom-module::completion corfu +orderless]] flag is enabled, users can
+perform code completion with multiple search keywords by use of space as the
+separator. More information can be found [[https://github.com/oantolin/orderless#company][here]]. Pressing [[kdb:][C-SPC]] again while
+completing inserts a space as separator. This allows searching with
+space-separated terms; each piece will match individually and in any order, with
+smart casing. Pressing just [[kbd:][SPC]] acts as normal and quits completion, so that
+when typing sentences it doesn't try to complete the whole sentence instead of
+just the word.
+
+Additionally, for users of evil and regular corfu style, [[kdb:][C-SPC]] is smart
+regarding your state. In normal-like states, enter insert then start corfu; in
+visual-like states, perform [[help:evil-change][evil-change]] (which leaves you in insert state) then
+start corfu; in insert-like states, start corfu immediatelly.
+
+** Exporting to the minibuffer (requires [[doom-module::completion vertico]])
+When using the [[doom-module::completion vertico]] module, which pulls in the
+[[doom-package:consult]] package, the entries shown in the completion popup can be
+exported to a consult minibuffer, giving access to all the manipulations the
+Vertico suite allows. For instance, one could use this to export with
+[[doom-package:embark]] via [[kbd:][C-c C-l]] and get a buffer with all candidates.
+
+* Configuration
+A few variables may be set to change behavior of this module:
+
+- [[var:corfu-auto-delay]] ::
+  Number of seconds till completion occurs automatically. Defaults to 0.1.
+- [[var:corfu-auto-prefix]] ::
+  Number of characters till auto-completion starts to happen. Defaults to 2.
+- [[var:corfu-on-exact-match]] ::
+  Configures behavior for exact matches. Its default is nil, and it's
+  recommended to leave it at that. Otherwise, single matches on snippet keys
+  expand immediately.
+
+** Adding CAPFs to a mode
+To add other CAPFs on a mode-per-mode basis, put either of the following in your
+~config.el~:
+
+#+begin_src emacs-lisp
+(add-hook! some-mode (add-to-list 'completion-at-point-functions #'some-capf))
+;; OR, but note the different call signature
+(add-hook 'some-mode-hook (lambda () (add-to-list 'completion-at-point-functions #'some-capf)))
+#+end_src
+
+~DEPTH~ above is an integer between -100, 100, and defaults to 0 of omitted.  Also
+see ~add-hook!~'s documentation for additional ways to call it. ~add-hook~ only
+accepts the quoted arguments form above.
+
+* Troubleshooting
+[[doom-report:][Report an issue?]]
+
+* Frequently asked questions
+/This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]]
+
+* TODO Appendix
+#+begin_quote
+ 🔨 This module has no appendix yet. [[doom-contrib-module:][Write one?]]
+#+end_quote
diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el
new file mode 100644
index 000000000..c34cb8232
--- /dev/null
+++ b/modules/completion/corfu/autoload.el
@@ -0,0 +1,10 @@
+;;; completion/corfu/autoload.el -*- lexical-binding: t; -*-
+
+;;;###autoload
+(defun +corfu-move-to-minibuffer ()
+  ;; Taken from corfu's README.
+  ;; TODO: extend this to other completion front-ends.
+  (interactive)
+  (let ((completion-extra-properties corfu--extra)
+        (completion-cycle-threshold completion-cycling))
+    (apply #'consult-completion-in-region completion-in-region--data)))
diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
new file mode 100644
index 000000000..05574c1d8
--- /dev/null
+++ b/modules/completion/corfu/config.el
@@ -0,0 +1,122 @@
+;;; completion/corfu/config.el -*- lexical-binding: t; -*-
+
+;;
+;;; Packages
+(use-package! corfu
+  :defer t
+  :init
+  (global-corfu-mode)
+  :config
+  (setq corfu-auto t
+        corfu-auto-delay 0.1
+        corfu-auto-prefix 2
+        global-corfu-modes '((not
+                              erc-mode
+                              circe-mode
+                              help-mode
+                              gud-mode
+                              vterm-mode)
+                             t)
+        corfu-cycle t
+        corfu-separator (when (modulep! +orderless) ?\s)
+        corfu-preselect 'valid
+        corfu-count 16
+        corfu-max-width 120
+        corfu-preview-current 'insert
+        corfu-on-exact-match nil
+        corfu-quit-at-boundary (if (modulep! +orderless) 'separator t)
+        corfu-quit-no-match (if (modulep! +orderless) 'separator t)
+        ;; In the case of +tng, TAB should be smart regarding completion;
+        ;; However, it should otherwise behave like normal, whatever normal was.
+        tab-always-indent (if (modulep! +tng) 'complete tab-always-indent))
+  (add-to-list 'completion-category-overrides `(lsp-capf (styles ,@completion-styles)))
+
+  (map! :map corfu-mode-map
+        :e "C-M-i" #'completion-at-point
+        :i "C-SPC" #'completion-at-point
+        :n "C-SPC" (cmd! (call-interactively #'evil-insert-state)
+                         (call-interactively #'completion-at-point))
+        :v "C-SPC" (cmd! (call-interactively #'evil-change)
+                         (call-interactively #'completion-at-point)))
+  (map! :unless (modulep! :editor evil)
+        :map corfu-mode-map
+        "C-M-i" #'completion-at-point)
+
+  (add-hook! corfu-mode
+    (defun +corfu-mode-unbinds ()
+      ;; In `corfu-mode', unbind C-SPC from `global-map', so Emacs keeps searching.
+      (make-local-variable 'global-map)
+      (unbind-key "C-SPC" 'global-map)))
+
+  (after! evil
+    (add-hook 'evil-insert-state-exit-hook #'corfu-quit))
+
+  (when (modulep! +icons)
+    (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
+
+  (map! :map corfu-map
+        [return] #'corfu-insert
+        "RET" #'corfu-insert)
+  (when (modulep! +orderless)
+    (map! :map corfu-map
+          "C-SPC" #'corfu-insert-separator))
+  (when (modulep! +tng)
+    (map! :map corfu-map
+          [tab] #'corfu-next
+          [backtab] #'corfu-previous
+          "TAB" #'corfu-next
+          "S-TAB" #'corfu-previous)
+    (let ((cmds-del (cmds! (and (modulep! +tng)
+                                (> corfu--index -1)
+                                (eq corfu-preview-current 'insert))
+                           #'corfu-reset)))
+      (map! :map corfu-map
+            [backspace] cmds-del
+            "DEL" cmds-del)))
+
+  (after! vertico
+    (map! :map corfu-map
+          "M-m" #'+corfu-move-to-minibuffer
+          (:when (modulep! :editor evil)
+            "M-J" #'+corfu-move-to-minibuffer))))
+
+(use-package! cape
+  :defer t
+  :init
+  (add-hook! prog-mode
+    (defun +corfu-add-cape-file-h ()
+      (add-to-list 'completion-at-point-functions #'cape-file)))
+  (add-hook! (org-mode markdown-mode)
+    (defun +corfu-add-cape-elisp-block-h ()
+      (add-to-list 'completion-at-point-functions #'cape-elisp-block)))
+  (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible))
+
+(use-package! corfu-terminal
+  :when (not (display-graphic-p))
+  :hook ((corfu-mode . corfu-terminal-mode)))
+
+;;
+;;; Extensions
+
+(use-package! corfu-history
+  :hook ((corfu-mode . corfu-history-mode))
+  :config
+  (after! savehist (add-to-list 'savehist-additional-variables 'corfu-history)))
+
+
+(use-package! corfu-popupinfo
+  :hook ((corfu-mode . corfu-popupinfo-mode))
+  :config
+  (setq corfu-popupinfo-delay '(0.5 . 1.0))
+  (map! :map corfu-map
+        "C-<up>" #'corfu-popupinfo-scroll-down
+        "C-<down>" #'corfu-popupinfo-scroll-up
+        "C-S-p" #'corfu-popupinfo-scroll-down
+        "C-S-n" #'corfu-popupinfo-scroll-up
+        "C-h" #'corfu-popupinfo-toggle)
+  (map! :when (modulep! :editor evil)
+        :map corfu-popupinfo-map
+        ;; Reversed because popupinfo assumes opposite of what feels intuitive
+        ;; with evil.
+        "C-S-k" #'corfu-popupinfo-scroll-down
+        "C-S-j" #'corfu-popupinfo-scroll-up))
diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el
new file mode 100644
index 000000000..1620fcf99
--- /dev/null
+++ b/modules/completion/corfu/packages.el
@@ -0,0 +1,11 @@
+;; -*- no-byte-compile: t; -*-
+;;; completion/corfu/packages.el
+
+(package! corfu :pin "24dccafeea114b1aec7118f2a8405b46aa0051e0")
+(package! cape :pin "18a30f48bb8754421cb10dad99e0a406173d4551")
+(when (modulep! +icons)
+  (package! nerd-icons-corfu :pin "7077bb76fefc15aed967476406a19dc5c2500b3c"))
+(when (modulep! +orderless)
+  (package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f"))
+(when (modulep! :os tty)
+  (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc"))
diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el
index 68f1b73e9..84439288f 100644
--- a/modules/completion/vertico/packages.el
+++ b/modules/completion/vertico/packages.el
@@ -6,7 +6,7 @@
            :files ("*.el" "extensions/*.el"))
   :pin "a28370d07f35c5387c7a9ec2e5b67f0d4598058d")
 
-(package! orderless :pin "e6784026717a8a6a7dcd0bf31fd3414f148c542e")
+(package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f")
 
 (package! consult :pin "fe49dedd71802ff97be7b89f1ec4bd61b98c2b13")
 (package! consult-dir :pin "ed8f0874d26f10f5c5b181ab9f2cf4107df8a0eb")
diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el
index 5ae4a417d..96361aae4 100644
--- a/modules/tools/lsp/+lsp.el
+++ b/modules/tools/lsp/+lsp.el
@@ -138,8 +138,11 @@ server getting expensively restarted when reverting buffers."
                                    " "))
           (add-to-list 'global-mode-string
                        '(t (:eval lsp-modeline-icon))
-                       'append))))))
+                       'append)))))
 
+  (when (modulep! :completion corfu)
+    (setq lsp-completion-provider :none)
+    (add-hook 'lsp-mode-hook #'lsp-completion-mode)))
 
 (use-package! lsp-ui
   :hook (lsp-mode . lsp-ui-mode)

From 5ac596ee69844ca52e3a0624f289032589f29bc8 Mon Sep 17 00:00:00 2001
From: Luigi Sartor Piucco <luigipiucco@gmail.com>
Date: Wed, 26 Jul 2023 19:57:21 -0300
Subject: [PATCH 2/5] feat(corfu): add snippets

Yasnippet is now properly integrated! A previosly-unset default has now
been given to `corfu-on-exact-match`. With snippets, it causes immediate
expansion upon single match by default, so we set it to nil and
recommend against changing it in the README.
---
 modules/completion/corfu/README.org  | 3 ++-
 modules/completion/corfu/config.el   | 8 ++++++++
 modules/completion/corfu/packages.el | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org
index f300bde8c..534aa04a2 100644
--- a/modules/completion/corfu/README.org
+++ b/modules/completion/corfu/README.org
@@ -33,6 +33,7 @@ and highly non-native, but has some extra features and more maturity.
 - [[doom-package:nerd-icons-corfu]] if [[doom-module::completion corfu +icons]]
 - [[doom-package:orderless]] if [[doom-module::completion corfu +orderless]]
 - [[doom-package:corfu-terminal]] if [[doom-module::os tty]]
+- [[doom-package:yasnippet-capf]] if [[doom-module::editor snippets]]
 
 ** Hacks
 /No hacks documented for this module./
@@ -50,7 +51,7 @@ languages may lack code completion support altogether). Run ~$ doom doctor~ to
 find out if you're missing any dependencies. Note that Corfu may have support
 for completions in languages that have no development intelligence, since it
 supports generic, context insensitive candidates such as file names or recurring
-words.
+words. Snippets may also appear in the candidate list if available.
 
 * TODO Usage
 #+begin_quote
diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index 05574c1d8..8bdee441e 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -91,6 +91,14 @@
       (add-to-list 'completion-at-point-functions #'cape-elisp-block)))
   (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible))
 
+(use-package! yasnippet-capf
+  :when (modulep! :editor snippets)
+  :defer t
+  :init
+  (add-hook! 'yas-minor-mode-hook
+    (defun +corfu-add-yasnippet-capf-h ()
+      (add-hook 'completion-at-point-functions #'yasnippet-capf 30 t))))
+
 (use-package! corfu-terminal
   :when (not (display-graphic-p))
   :hook ((corfu-mode . corfu-terminal-mode)))
diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el
index 1620fcf99..ec9edc23f 100644
--- a/modules/completion/corfu/packages.el
+++ b/modules/completion/corfu/packages.el
@@ -9,3 +9,5 @@
   (package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f"))
 (when (modulep! :os tty)
   (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc"))
+(when (modulep! :editor snippets)
+  (package! yasnippet-capf :pin "a0a6b1c2bb6decdad5cf9b74202f0042f494a6ab"))

From 3cda41b63974dab9334e1d444a4ee55b547302a9 Mon Sep 17 00:00:00 2001
From: StrawberryTea <luneth1314@gmail.com>
Date: Mon, 30 Oct 2023 14:36:19 -0400
Subject: [PATCH 3/5] feat(corfu): more CAPFs and ergonomy changes

Add various CAPFs from cape:
- `cape-line`;
- `cape-dabbrev`;
- `cape-emoji`;
- `cape-dict`;
Fixed some CAPFs via cape:
- Make non-exclusive, purified and silent `pcomplete-completions-at-point`;
- Make non-exclusive and non-interruptable `lsp-completion-at-point`;
- Make non-exclusive `eglot-completion-at-point`;
- Make non-exclusive `comint-completion-at-point`;
Fix and improve keybindings:
- Smart `DEL`/`backspace` for `+tng`;
- Smart `RET`;
Add depth to CAPFs, allowing ordering to be adjustable.
Enable in minibuffer.
---
 modules/completion/corfu/README.org | 65 ++++++++++++++-------
 modules/completion/corfu/config.el  | 87 ++++++++++++++++++++++++++++-
 2 files changed, 128 insertions(+), 24 deletions(-)

diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org
index 534aa04a2..75124ff46 100644
--- a/modules/completion/corfu/README.org
+++ b/modules/completion/corfu/README.org
@@ -26,6 +26,14 @@ and highly non-native, but has some extra features and more maturity.
 - +orderless ::
   Pull in [[doom-package:orderless]] if necessary and apply multi-component
   completion (still needed if [[doom-module::completion vertico]] is active).
+- +dabbrev ::
+  Enable and configure [[doom-package:dabbrev]] as a close-to-universal CAPF
+  fallback.
+- +dict ::
+  Enable and configure dictionary completion for text modes and related regions
+  in programming modes.
+- +emoji ::
+  Enable and configure emoji completion via the emoji input method.
 
 ** Packages
 - [[doom-package:corfu]]
@@ -63,26 +71,25 @@ By default, completion gets triggered after typing 2 non-space consecutive
 characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup
 is visible, the following relevant keys are available:
 
-| Keybind  | Description                                                      |
-|----------+------------------------------------------------------------------|
-| [[kbd:][<down>]]   | Go to next candidate                                             |
-| [[kbd:][<up>]]     | Go to previous candidate                                         |
-| [[kbd:][C-n]]      | Go to next candidate                                             |
-| [[kbd:][C-p]]      | Go to previous candidate                                         |
-| [[kbd:][C-j]]      | (evil) Go to next candidate                                      |
-| [[kbd:][C-k]]      | (evil) Go to previous candidate                                  |
-| [[kbd:][C-<down>]] | Go to next doc line                                              |
-| [[kbd:][C-<up>]]   | Go to previous doc line                                          |
-| [[kbd:][C-S-n]]    | Go to next doc line                                              |
-| [[kbd:][C-S-p]]    | Go to previous doc line                                          |
-| [[kbd:][C-S-j]]    | (evil) Go to next doc line                                       |
-| [[kbd:][C-S-k]]    | (evil) Go to previous doc line                                   |
-| [[kbd:][C-h]]      | Toggle documentation (if available)                              |
+| Keybind  | Description                                             |
+|----------+---------------------------------------------------------|
+| [[kbd:][<down>]]   | Go to next candidate                                    |
+| [[kbd:][<up>]]     | Go to previous candidate                                |
+| [[kbd:][C-n]]      | Go to next candidate                                    |
+| [[kbd:][C-p]]      | Go to previous candidate                                |
+| [[kbd:][C-j]]      | (evil) Go to next candidate                             |
+| [[kbd:][C-k]]      | (evil) Go to previous candidate                         |
+| [[kbd:][C-<down>]] | Go to next doc line                                     |
+| [[kbd:][C-<up>]]   | Go to previous doc line                                 |
+| [[kbd:][C-S-n]]    | Go to next doc line                                     |
+| [[kbd:][C-S-p]]    | Go to previous doc line                                 |
+| [[kbd:][C-S-j]]    | (evil) Go to next doc line                              |
+| [[kbd:][C-S-k]]    | (evil) Go to previous doc line                          |
+| [[kbd:][C-h]]      | Toggle documentation (if available)                     |
 | [[kbd:][M-m]]      | Export to minibuffer (if [[doom-module::completion vertico]])        |
-| [[kbd:][M-S-j]]    | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) |
-| [[kbd:][RET]]      | Insert candidate                                                 |
-| [[kbd:][SPC]]      | (after wildcard) Reset completion                                |
-| [[kbd:][DEL]]      | Reset completion                                                 |
+| [[kbd:][M-j]]      | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) |
+| [[kbd:][RET]]      | Insert candidate                                        |
+| [[kbd:][SPC]]      | Quit autocompletion after a wildcard or pass-through    |
 | [[kbd:][C-SPC]]    | Complete (unless [[doom-module::completion corfu +tng]])             |
 | [[kbd:][C-SPC]]    | (when completing) Insert separator DWIM (see below)              |
 
@@ -95,6 +102,7 @@ following additional binds:
 | [[kbd:][TAB]]     | Complete                                      |
 | [[kbd:][TAB]]     | (when completing) Go to next candidate        |
 | [[kbd:][S-TAB]]   | (when completing) Go to previous candidate    |
+| [[kbd:][DEL]]     | (when completing) Reset completion DWIM-style |
 
 ** Searching with multiple keywords
 If the [[doom-module::completion corfu +orderless]] flag is enabled, users can
@@ -129,15 +137,19 @@ A few variables may be set to change behavior of this module:
   Configures behavior for exact matches. Its default is nil, and it's
   recommended to leave it at that. Otherwise, single matches on snippet keys
   expand immediately.
+- [[var:+corfu-buffer-scanning-size-limit]]  ::
+    Sets the maximum buffer size to be scanned by ~cape-dabbrev~ and
+  ~cape-lines~. Defaults to 1 MB. Set this if you are having performance
+  problems using either CAPF.
 
 ** Adding CAPFs to a mode
 To add other CAPFs on a mode-per-mode basis, put either of the following in your
 ~config.el~:
 
 #+begin_src emacs-lisp
-(add-hook! some-mode (add-to-list 'completion-at-point-functions #'some-capf))
+(add-hook! some-mode (add-hook 'completion-at-point-functions #'some-capf depth t))
 ;; OR, but note the different call signature
-(add-hook 'some-mode-hook (lambda () (add-to-list 'completion-at-point-functions #'some-capf)))
+(add-hook 'some-mode-hook (lambda () (add-hook 'completion-at-point-functions #'some-capf depth t)))
 #+end_src
 
 ~DEPTH~ above is an integer between -100, 100, and defaults to 0 of omitted.  Also
@@ -147,6 +159,17 @@ accepts the quoted arguments form above.
 * Troubleshooting
 [[doom-report:][Report an issue?]]
 
+If you have performance issues with ~cape-dabbrev~, the first thing I recommend
+doing is to look at the list of buffers Dabbrev is scanning:
+
+#+begin_src emacs-lisp
+(dabbrev--select-buffers) ; => (#<buffer README.org> #<buffer config.el<3>> #<buffer cape.el> ...)
+(length (dabbrev--select-buffers)) ; => 37
+#+end_src
+
+... and modify ~dabbrev-ignored-buffer-regexps~ or ~dabbrev-ignored-buffer-modes~
+accordingly.
+
 * Frequently asked questions
 /This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]]
 
diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index 8bdee441e..081f16c21 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -1,5 +1,11 @@
 ;;; completion/corfu/config.el -*- lexical-binding: t; -*-
 
+(defvar +corfu-buffer-scanning-size-limit (* 1 1024 1024) ; 1 MB
+  "Size limit for a buffer to be scanned by `cape-line' or `cape-dabbrev'.
+
+As an exception, `cape-line' will also scan buffers with the same
+major mode regardless of size.")
+
 ;;
 ;;; Packages
 (use-package! corfu
@@ -19,7 +25,7 @@
                              t)
         corfu-cycle t
         corfu-separator (when (modulep! +orderless) ?\s)
-        corfu-preselect 'valid
+        corfu-preselect (if (modulep! +tng) 'prompt 'valid)
         corfu-count 16
         corfu-max-width 120
         corfu-preview-current 'insert
@@ -48,6 +54,13 @@
       (make-local-variable 'global-map)
       (unbind-key "C-SPC" 'global-map)))
 
+  (add-hook! 'minibuffer-setup-hook
+    (defun +corfu-enable-in-minibuffer ()
+      "Enable Corfu in the minibuffer if `completion-at-point' is bound."
+      (when (where-is-internal #'completion-at-point (list (current-local-map)))
+        (setq-local corfu-echo-delay nil)
+        (corfu-mode +1))))
+
   (after! evil
     (add-hook 'evil-insert-state-exit-hook #'corfu-quit))
 
@@ -85,10 +98,78 @@
   :init
   (add-hook! prog-mode
     (defun +corfu-add-cape-file-h ()
-      (add-to-list 'completion-at-point-functions #'cape-file)))
+      (add-hook 'completion-at-point-functions #'cape-file -10 t)))
   (add-hook! (org-mode markdown-mode)
     (defun +corfu-add-cape-elisp-block-h ()
-      (add-to-list 'completion-at-point-functions #'cape-elisp-block)))
+      (add-hook 'completion-at-point-functions #'cape-elisp-block 0 t)))
+  ;; Enable Dabbrev completion basically everywhere as a fallback.
+  (when (modulep! +dabbrev)
+    ;; Set up `cape-dabbrev' options.
+    (defun +dabbrev-friend-buffer-p (other-buffer)
+      (< (buffer-size other-buffer) +corfu-buffer-scanning-size-limit))
+    (after! dabbrev
+      (setq cape-dabbrev-check-other-buffers t
+            dabbrev-friend-buffer-function #'+dabbrev-friend-buffer-p
+            dabbrev-ignored-buffer-regexps
+            '("^ "
+              "\\(TAGS\\|tags\\|ETAGS\\|etags\\|GTAGS\\|GRTAGS\\|GPATH\\)\\(<[0-9]+>\\)?")
+            dabbrev-upcase-means-case-search t)
+      (add-to-list 'dabbrev-ignored-buffer-modes 'pdf-view-mode)
+
+      (add-hook! (prog-mode text-mode conf-mode comint-mode minibuffer-setup
+                            eshell-mode)
+        (defun +corfu-add-cape-dabbrev-h ()
+          (add-hook 'completion-at-point-functions #'cape-dabbrev 20 t)))))
+  (when (modulep! +line)
+    ;; Set up `cape-line' options.
+    (defun +cape-line-buffers ()
+      (cl-loop for buf in (buffer-list)
+               if (or (eq major-mode (buffer-local-value 'major-mode buf))
+                      (< (buffer-size buf) +corfu-buffer-scanning-size-limit))
+               collect buf))
+    (setq cape-line-buffer-function #'+cape-line-buffers)
+    (add-hook! (text-mode comint-mode minibuffer-setup)
+      (defun +corfu-add-cape-line-h ()
+        (add-hook 'completion-at-point-functions #'cape-line 20 t))))
+  ;; Complete emojis :).
+  (when (and (modulep! +emoji) (> emacs-major-version 28))
+    (add-hook! (prog-mode conf-mode)
+      (defun +corfu-add-cape-emoji-h ()
+        (add-hook 'completion-at-point-functions
+                  (cape-capf-inside-faces
+                   (cape-capf-prefix-length #'cape-emoji 1)
+                   ;; Only call inside comments and docstrings.
+                   'tree-sitter-hl-face:doc 'font-lock-doc-face
+                   'font-lock-comment-face 'tree-sitter-hl-face:comment)
+                  10 t)))
+    (add-hook! text-mode
+      (defun +corfu-add-cape-emoji-text-h ()
+        (add-hook 'completion-at-point-functions
+                  (cape-capf-prefix-length #'cape-emoji 1) 10 t))))
+  ;; Enable dictionary-based autocompletion.
+  (when (modulep! +dict)
+    (add-hook! (prog-mode conf-mode)
+      (defun +corfu-add-cape-dict-h ()
+        (add-hook 'completion-at-point-functions
+                  (cape-capf-inside-faces
+                   ;; Only call inside comments and docstrings.
+                   #'cape-dict 'tree-sitter-hl-face:doc 'font-lock-doc-face
+                   'font-lock-comment-face 'tree-sitter-hl-face:comment)
+                  40 t)))
+    (add-hook! text-mode
+      (defun +corfu-add-cape-dict-text-h ()
+        (add-hook 'completion-at-point-functions #'cape-dict 40 t))))
+
+  ;; Make these capfs composable.
+  (advice-add #'comint-completion-at-point :around #'cape-wrap-nonexclusive)
+  (advice-add #'eglot-completion-at-point :around #'cape-wrap-nonexclusive)
+  (advice-add #'lsp-completion-at-point :around #'cape-wrap-nonexclusive)
+  (advice-add #'pcomplete-completions-at-point :around #'cape-wrap-nonexclusive)
+  ;; From the `cape' readme. Without this, Eshell autocompletion is broken on
+  ;; Emacs28.
+  (when (< emacs-major-version 29)
+    (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-silent)
+    (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify))
   (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible))
 
 (use-package! yasnippet-capf

From 79e9fb31196eec848a931c71f75b1b6d18c4c1ca Mon Sep 17 00:00:00 2001
From: Luigi Sartor Piucco <luigipiucco@gmail.com>
Date: Sun, 29 Oct 2023 14:31:13 -0300
Subject: [PATCH 4/5] feat(corfu, vertico): use equal orderless config

This removes the old `&` separator for Vertico (does anyone use that
instead of just space?) in favor of escapable space and unifies
orderless config with Corfu. Also implements smart separator
insert/escape/reset on `C-SPC`

Co-authored-by: Liam Hupfer <liam@hpfr.net>
---
 modules/completion/corfu/README.org  | 39 +++++++++++++++-------------
 modules/completion/corfu/autoload.el | 15 +++++++++++
 modules/completion/corfu/config.el   | 33 +++++++++++------------
 modules/completion/vertico/config.el |  2 +-
 4 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org
index 75124ff46..b9c0b0b96 100644
--- a/modules/completion/corfu/README.org
+++ b/modules/completion/corfu/README.org
@@ -71,25 +71,25 @@ By default, completion gets triggered after typing 2 non-space consecutive
 characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup
 is visible, the following relevant keys are available:
 
-| Keybind  | Description                                             |
-|----------+---------------------------------------------------------|
-| [[kbd:][<down>]]   | Go to next candidate                                    |
-| [[kbd:][<up>]]     | Go to previous candidate                                |
-| [[kbd:][C-n]]      | Go to next candidate                                    |
-| [[kbd:][C-p]]      | Go to previous candidate                                |
-| [[kbd:][C-j]]      | (evil) Go to next candidate                             |
-| [[kbd:][C-k]]      | (evil) Go to previous candidate                         |
-| [[kbd:][C-<down>]] | Go to next doc line                                     |
-| [[kbd:][C-<up>]]   | Go to previous doc line                                 |
-| [[kbd:][C-S-n]]    | Go to next doc line                                     |
-| [[kbd:][C-S-p]]    | Go to previous doc line                                 |
-| [[kbd:][C-S-j]]    | (evil) Go to next doc line                              |
-| [[kbd:][C-S-k]]    | (evil) Go to previous doc line                          |
-| [[kbd:][C-h]]      | Toggle documentation (if available)                     |
+| Keybind  | Description                                                      |
+|----------+------------------------------------------------------------------|
+| [[kbd:][<down>]]   | Go to next candidate                                             |
+| [[kbd:][<up>]]     | Go to previous candidate                                         |
+| [[kbd:][C-n]]      | Go to next candidate                                             |
+| [[kbd:][C-p]]      | Go to previous candidate                                         |
+| [[kbd:][C-j]]      | (evil) Go to next candidate                                      |
+| [[kbd:][C-k]]      | (evil) Go to previous candidate                                  |
+| [[kbd:][C-<down>]] | Go to next doc line                                              |
+| [[kbd:][C-<up>]]   | Go to previous doc line                                          |
+| [[kbd:][C-S-n]]    | Go to next doc line                                              |
+| [[kbd:][C-S-p]]    | Go to previous doc line                                          |
+| [[kbd:][C-S-j]]    | (evil) Go to next doc line                                       |
+| [[kbd:][C-S-k]]    | (evil) Go to previous doc line                                   |
+| [[kbd:][C-h]]      | Toggle documentation (if available)                              |
 | [[kbd:][M-m]]      | Export to minibuffer (if [[doom-module::completion vertico]])        |
 | [[kbd:][M-j]]      | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) |
-| [[kbd:][RET]]      | Insert candidate                                        |
-| [[kbd:][SPC]]      | Quit autocompletion after a wildcard or pass-through    |
+| [[kbd:][RET]]      | Insert candidate                                                 |
+| [[kbd:][SPC]]      | Quit autocompletion after a wildcard or pass-through             |
 | [[kbd:][C-SPC]]    | Complete (unless [[doom-module::completion corfu +tng]])             |
 | [[kbd:][C-SPC]]    | (when completing) Insert separator DWIM (see below)              |
 
@@ -112,7 +112,10 @@ completing inserts a space as separator. This allows searching with
 space-separated terms; each piece will match individually and in any order, with
 smart casing. Pressing just [[kbd:][SPC]] acts as normal and quits completion, so that
 when typing sentences it doesn't try to complete the whole sentence instead of
-just the word.
+just the word. Pressing [[kdb:][C-SPC]] with point after a separator escapes it with a
+backslash, including the space in the search term, and pressing it with an
+already escaped separator before point deletes it. Thus, you can cycle back if
+you accidentaly press more than needed.
 
 Additionally, for users of evil and regular corfu style, [[kdb:][C-SPC]] is smart
 regarding your state. In normal-like states, enter insert then start corfu; in
diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el
index c34cb8232..618aae42d 100644
--- a/modules/completion/corfu/autoload.el
+++ b/modules/completion/corfu/autoload.el
@@ -8,3 +8,18 @@
   (let ((completion-extra-properties corfu--extra)
         (completion-cycle-threshold completion-cycling))
     (apply #'consult-completion-in-region completion-in-region--data)))
+
+;;;###autoload
+(defun +corfu-smart-sep-toggle-escape ()
+  "Insert `corfu-separator' or toggle escape if it's already there."
+  (interactive)
+  (cond ((and (char-equal (char-before) corfu-separator)
+              (char-equal (char-before (1- (point))) ?\\))
+         (save-excursion (delete-char -2)))
+        ((char-equal (char-before) corfu-separator)
+         (save-excursion (backward-char 1)
+                         (insert-char ?\\)))
+        (t
+         ;; Without this corfu quits immediately.
+         (setq this-command #'corfu-insert-separator)
+         (call-interactively #'corfu-insert-separator))))
diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index 081f16c21..dd37c3006 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -67,26 +67,27 @@ major mode regardless of size.")
   (when (modulep! +icons)
     (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
 
-  (map! :map corfu-map
-        [return] #'corfu-insert
-        "RET" #'corfu-insert)
-  (when (modulep! +orderless)
+  (let ((cmds-del (cmds! (and (modulep! +tng)
+                              (> corfu--index -1)
+                              (eq corfu-preview-current 'insert))
+                         #'corfu-reset)))
     (map! :map corfu-map
-          "C-SPC" #'corfu-insert-separator))
-  (when (modulep! +tng)
-    (map! :map corfu-map
-          [tab] #'corfu-next
-          [backtab] #'corfu-previous
-          "TAB" #'corfu-next
-          "S-TAB" #'corfu-previous)
-    (let ((cmds-del (cmds! (and (modulep! +tng)
-                                (> corfu--index -1)
-                                (eq corfu-preview-current 'insert))
-                           #'corfu-reset)))
-      (map! :map corfu-map
+          [return] #'corfu-insert
+          "RET" #'corfu-insert
+          (:when (modulep! +orderless)
+            "<remap> <completion-at-point>" #'+corfu-smart-sep-toggle-escape)
+          (:when (modulep! +tng)
+            [tab] #'corfu-next
+            [backtab] #'corfu-previous
+            "TAB" #'corfu-next
+            "S-TAB" #'corfu-previous
             [backspace] cmds-del
             "DEL" cmds-del)))
 
+  (when (modulep! +orderless)
+    (after! orderless
+      (setq orderless-component-separator #'orderless-escapable-split-on-space)))
+
   (after! vertico
     (map! :map corfu-map
           "M-m" #'+corfu-move-to-minibuffer
diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el
index a4efa7c4e..afd196fbb 100644
--- a/modules/completion/vertico/config.el
+++ b/modules/completion/vertico/config.el
@@ -110,7 +110,7 @@ orderless."
         ;; find-file etc.
         completion-category-overrides '((file (styles +vertico-basic-remote orderless partial-completion)))
         orderless-style-dispatchers '(+vertico-orderless-dispatch)
-        orderless-component-separator "[ &]")
+        orderless-component-separator #'orderless-escapable-split-on-space)
   ;; ...otherwise find-file gets different highlighting than other commands
   (set-face-attribute 'completions-first-difference nil :inherit nil))
 

From 899cb2c54944b9925f312ba1b0763f449f32f7ff Mon Sep 17 00:00:00 2001
From: Luigi Sartor Piucco <luigipiucco@gmail.com>
Date: Mon, 11 Dec 2023 19:12:54 -0300
Subject: [PATCH 5/5] fix(corfu): move binds to `:config default`

Bindings were moved to the `:config default` module and some keys were
adjusted to match Company/other modules. Small formatting issues and
some apparently inintended nestings were corrected as well.
---
 modules/completion/corfu/config.el        | 61 +----------------------
 modules/config/default/+emacs-bindings.el |  9 +++-
 modules/config/default/+evil-bindings.el  | 50 +++++++++++++++----
 modules/config/default/config.el          | 39 +++++++++++++--
 4 files changed, 85 insertions(+), 74 deletions(-)

diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index dd37c3006..1c32a7c2b 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -37,17 +37,6 @@ major mode regardless of size.")
         tab-always-indent (if (modulep! +tng) 'complete tab-always-indent))
   (add-to-list 'completion-category-overrides `(lsp-capf (styles ,@completion-styles)))
 
-  (map! :map corfu-mode-map
-        :e "C-M-i" #'completion-at-point
-        :i "C-SPC" #'completion-at-point
-        :n "C-SPC" (cmd! (call-interactively #'evil-insert-state)
-                         (call-interactively #'completion-at-point))
-        :v "C-SPC" (cmd! (call-interactively #'evil-change)
-                         (call-interactively #'completion-at-point)))
-  (map! :unless (modulep! :editor evil)
-        :map corfu-mode-map
-        "C-M-i" #'completion-at-point)
-
   (add-hook! corfu-mode
     (defun +corfu-mode-unbinds ()
       ;; In `corfu-mode', unbind C-SPC from `global-map', so Emacs keeps searching.
@@ -67,32 +56,9 @@ major mode regardless of size.")
   (when (modulep! +icons)
     (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
 
-  (let ((cmds-del (cmds! (and (modulep! +tng)
-                              (> corfu--index -1)
-                              (eq corfu-preview-current 'insert))
-                         #'corfu-reset)))
-    (map! :map corfu-map
-          [return] #'corfu-insert
-          "RET" #'corfu-insert
-          (:when (modulep! +orderless)
-            "<remap> <completion-at-point>" #'+corfu-smart-sep-toggle-escape)
-          (:when (modulep! +tng)
-            [tab] #'corfu-next
-            [backtab] #'corfu-previous
-            "TAB" #'corfu-next
-            "S-TAB" #'corfu-previous
-            [backspace] cmds-del
-            "DEL" cmds-del)))
-
   (when (modulep! +orderless)
     (after! orderless
-      (setq orderless-component-separator #'orderless-escapable-split-on-space)))
-
-  (after! vertico
-    (map! :map corfu-map
-          "M-m" #'+corfu-move-to-minibuffer
-          (:when (modulep! :editor evil)
-            "M-J" #'+corfu-move-to-minibuffer))))
+      (setq orderless-component-separator #'orderless-escapable-split-on-space))))
 
 (use-package! cape
   :defer t
@@ -121,17 +87,6 @@ major mode regardless of size.")
                             eshell-mode)
         (defun +corfu-add-cape-dabbrev-h ()
           (add-hook 'completion-at-point-functions #'cape-dabbrev 20 t)))))
-  (when (modulep! +line)
-    ;; Set up `cape-line' options.
-    (defun +cape-line-buffers ()
-      (cl-loop for buf in (buffer-list)
-               if (or (eq major-mode (buffer-local-value 'major-mode buf))
-                      (< (buffer-size buf) +corfu-buffer-scanning-size-limit))
-               collect buf))
-    (setq cape-line-buffer-function #'+cape-line-buffers)
-    (add-hook! (text-mode comint-mode minibuffer-setup)
-      (defun +corfu-add-cape-line-h ()
-        (add-hook 'completion-at-point-functions #'cape-line 20 t))))
   ;; Complete emojis :).
   (when (and (modulep! +emoji) (> emacs-major-version 28))
     (add-hook! (prog-mode conf-mode)
@@ -197,16 +152,4 @@ major mode regardless of size.")
 (use-package! corfu-popupinfo
   :hook ((corfu-mode . corfu-popupinfo-mode))
   :config
-  (setq corfu-popupinfo-delay '(0.5 . 1.0))
-  (map! :map corfu-map
-        "C-<up>" #'corfu-popupinfo-scroll-down
-        "C-<down>" #'corfu-popupinfo-scroll-up
-        "C-S-p" #'corfu-popupinfo-scroll-down
-        "C-S-n" #'corfu-popupinfo-scroll-up
-        "C-h" #'corfu-popupinfo-toggle)
-  (map! :when (modulep! :editor evil)
-        :map corfu-popupinfo-map
-        ;; Reversed because popupinfo assumes opposite of what feels intuitive
-        ;; with evil.
-        "C-S-k" #'corfu-popupinfo-scroll-down
-        "C-S-j" #'corfu-popupinfo-scroll-up))
+  (setq corfu-popupinfo-delay '(0.5 . 1.0)))
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 7aa4dfc41..ab29c5977 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -511,7 +511,7 @@
       "C-x C-b"     #'ibuffer
       "C-x K"       #'doom/kill-this-buffer-in-all-windows
 
-      ;;; company-mode
+      ;;; completion (in-buffer)
       (:when (modulep! :completion company)
        "C-;" #'+company/complete
        (:after company
@@ -537,6 +537,13 @@
         "C-p"        #'company-search-repeat-backward
         "C-s"        (cmd! (company-search-abort) (company-filter-candidates))))
 
+      (:when (modulep! :completion corfu)
+       :after corfu
+       (:map corfu-mode-map
+        "C-M-i" #'completion-at-point)
+       (:map corfu-popupinfo-map
+         "C-S-h" #'corfu-popupinfo-toggle))
+
       ;;; ein notebooks
       (:after ein:notebook-multilang
         :map ein:notebook-multilang-mode-map
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index a62541d4c..496a8abfe 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -43,7 +43,10 @@
                       #'yas-expand
                       (and (bound-and-true-p company-mode)
                            (modulep! :completion company +tng))
-                      #'company-indent-or-complete-common)
+                      #'company-indent-or-complete-common
+                      (and (bound-and-true-p corfu-mode)
+                           (modulep! :completion corfu +tng))
+                      #'completion-at-point)
       :m [tab] (cmds! (and (modulep! :editor snippets)
                            (evil-visual-state-p)
                            (or (eq evil-visual-selection 'line)
@@ -127,7 +130,7 @@
 ;;
 ;;; Module keybinds
 
-;;; :completion
+;;; :completion (in-buffer)
 (map! (:when (modulep! :completion company)
        :i "C-@"    (cmds! (not (minibufferp)) #'company-complete-common)
        :i "C-SPC"  (cmds! (not (minibufferp)) #'company-complete-common)
@@ -156,7 +159,31 @@
          "C-s"     #'company-filter-candidates
          [escape]  #'company-search-abort)))
 
-      (:when (modulep! :completion ivy)
+      (:when (modulep! :completion corfu)
+       (:after corfu
+        (:map corfu-mode-map
+         :e "C-M-i" #'completion-at-point
+         (:unless (modulep! :completion corfu +tng)
+          :i "C-SPC" #'completion-at-point
+          :n "C-SPC" (cmd! (call-interactively #'evil-insert-state)
+                           (call-interactively #'completion-at-point))
+          :v "C-SPC" (cmd! (call-interactively #'evil-change)
+                           (call-interactively #'completion-at-point))))
+        (:map corfu-map
+          "C-u" (cmd! (let ((corfu-cycle nil))
+                        (funcall-interactively #'corfu-next (- corfu-count))))
+          "C-d" (cmd! (let ((corfu-cycle nil))
+                        (funcall-interactively #'corfu-next corfu-count)))))
+       (:after corfu-popupinfo
+        :map corfu-popupinfo-map
+        ;; Reversed because popupinfo assumes opposite of what feels intuitive
+        ;; with evil.
+        "C-S-k" #'corfu-popupinfo-scroll-down
+        "C-S-j" #'corfu-popupinfo-scroll-up
+        "C-h"   #'corfu-popupinfo-toggle)))
+
+;;; :completion (separate)
+(map! (:when (modulep! :completion ivy)
        (:after ivy
         :map ivy-minibuffer-map
         "C-SPC" #'ivy-call-and-recenter  ; preview file
@@ -169,7 +196,8 @@
         [C-return] #'+ivy/git-grep-other-window-action))
 
       (:when (modulep! :completion helm)
-       (:after helm :map helm-map
+       (:after helm
+        :map helm-map
         [remap next-line]     #'helm-next-line
         [remap previous-line] #'helm-previous-line
         [left]     #'left-char
@@ -371,8 +399,10 @@
       ;;; <leader> c --- code
       (:prefix-map ("c" . "code")
        (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot)))
-        :desc "LSP Execute code action" "a" #'lsp-execute-code-action
-        :desc "LSP Organize imports" "o" #'lsp-organize-imports
+        :desc "LSP"                                  "l"   #'+default/lsp-command-map
+        :desc "LSP Execute code action"              "a"   #'lsp-execute-code-action
+        :desc "LSP Organize imports"                 "o"   #'lsp-organize-imports
+        :desc "LSP Rename"                           "r"   #'lsp-rename
         (:when (modulep! :completion ivy)
          :desc "Jump to symbol in current workspace" "j"   #'lsp-ivy-workspace-symbol
          :desc "Jump to symbol in any workspace"     "J"   #'lsp-ivy-global-workspace-symbol)
@@ -387,12 +417,10 @@
          :desc "Incoming call hierarchy"             "y"   #'lsp-treemacs-call-hierarchy
          :desc "Outgoing call hierarchy"             "Y"   (cmd!! #'lsp-treemacs-call-hierarchy t)
          :desc "References tree"                     "R"   (cmd!! #'lsp-treemacs-references t)
-         :desc "Symbols"                             "S"   #'lsp-treemacs-symbols)
-         :desc "LSP"                                 "l"   #'+default/lsp-command-map
-         :desc "LSP Rename"                          "r"   #'lsp-rename)
+         :desc "Symbols"                             "S"   #'lsp-treemacs-symbols))
        (:when (modulep! :tools lsp +eglot)
-        :desc "LSP Execute code action" "a" #'eglot-code-actions
-        :desc "LSP Rename" "r" #'eglot-rename
+        :desc "LSP Execute code action"              "a"   #'eglot-code-actions
+        :desc "LSP Rename"                           "r"   #'eglot-rename
         :desc "LSP Find declaration"                 "j"   #'eglot-find-declaration
         (:when (modulep! :completion vertico)
          :desc "Jump to symbol in current workspace" "j"   #'consult-eglot-symbols))
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index f4a301488..58befa14f 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -48,8 +48,8 @@
                           (time-to-seconds))
                     collect (epg-sub-key-fingerprint subkey))))
        user-mail-address))
-   ;; And suppress prompts if epa-file-encrypt-to has a default value (without
-   ;; overwriting file-local values).
+  ;; And suppress prompts if epa-file-encrypt-to has a default value (without
+  ;; overwriting file-local values).
   (defadvice! +default--dont-prompt-for-keys-a (&rest _)
     :before #'epa-file-write-region
     (unless (local-variable-p 'epa-file-encrypt-to)
@@ -165,7 +165,7 @@
         (and (sp-in-code-p id action context)
              (save-excursion
                (goto-char (line-beginning-position))
-               (looking-at-p "[ 	]*#include[^<]+"))))
+               (looking-at-p "[ \t]*#include[^<]+"))))
 
       ;; ...and leave it to smartparens
       (sp-local-pair '(c++-mode objc-mode)
@@ -453,6 +453,39 @@ Continues comments if executed from a commented line. Consults
                          '(evil-ex-completion-map)))
       "C-s" command))
 
+  (map! :when (modulep! :completion corfu)
+        :after corfu
+        (:map corfu-map
+         [return] #'corfu-insert
+         "RET" #'corfu-insert
+         "C-s" #'+corfu-move-to-minibuffer
+         "C-p" #'corfu-previous
+         "C-n" #'corfu-next
+         (:when (modulep! :completion corfu +orderless)
+          "<remap> <completion-at-point>" #'+corfu-smart-sep-toggle-escape)
+         (:when (modulep! :completion corfu +tng)
+          [tab] #'corfu-next
+          "TAB" #'corfu-next
+          [backtab] #'corfu-previous
+          "S-TAB" #'corfu-previous))
+        (:after corfu-popupinfo
+         :map corfu-popupinfo-map
+         "C-<up>" #'corfu-popupinfo-scroll-down
+         "C-<down>" #'corfu-popupinfo-scroll-up
+         "C-S-p" #'corfu-popupinfo-scroll-down
+         "C-S-n" #'corfu-popupinfo-scroll-up
+         "C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height))
+         "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height))))
+
+  (when-let ((cmds-del (and (modulep! :completion corfu +tng)
+                            (cmds! (and (> corfu--index -1)
+                                        (eq corfu-preview-current 'insert))
+                                   #'corfu-reset))))
+    (map! :after corfu
+          :map corfu-map
+          [backspace] cmds-del
+          "DEL" cmds-del))
+
   ;; Smarter C-a/C-e for both Emacs and Evil. C-a will jump to indentation.
   ;; Pressing it again will send you to the true bol. Same goes for C-e, except
   ;; it will ignore comments+trailing whitespace before jumping to eol.