completion: corfu and dabbrev

2 files changed, 10 insertions, 10 deletions

diff --git a/completion.org b/completion.org
index 1f1718f..4f5787c 100644
--- a/completion.org
+++ b/completion.org
@@ -19,22 +19,24 @@
             orderless-matching-styles
             '(orderless-literal orderless-regexp orderless-initialism)))
   #+end_src
-* corfu
+* corfu and dabbrev
   #+begin_src emacs-lisp
     (jao-load-path "corfu")
     (use-package corfu
 
-      :init (setq corfu-cycle t)
+      :init (setq corfu-cycle t
+                  corfu-excluded-modes nil)
+
+      :config (corfu-global-mode)
 
       :bind (:map corfu-map
              ("TAB" . corfu-next)
-             ("S-TAB" . corfu-previous))
+             ("S-TAB" . corfu-previous)))
 
-      :hook ((eshell-mode . corfu-mode)
-             (haskell-interactive-mode . corfu-mode)
-             (message-mode . corfu-mode)
-             (prog-mode . corfu-mode)
-             (lisp-interaction-mode . corfu-mode)))
+    (use-package dabbrev
+      ;; Swap M-/ and C-M-/
+      :bind (("M-/" . dabbrev-completion)
+             ("C-M-/" . dabbrev-expand)))
   #+end_src
 * vertico
   #+begin_src emacs-lisp
diff --git a/init.org b/init.org
index 06d9bf4..c0ec176 100644
--- a/init.org
+++ b/init.org
@@ -3419,8 +3419,6 @@
     #+end_src
 * Key bindings
   #+begin_src emacs-lisp
-    (global-set-key "\M-\\" #'hippie-expand)
-    (global-set-key "\C-c." #'goto-last-change)
     (global-set-key "\C-cj" #'join-line)
     (global-set-key "\C-cq" #'auto-fill-mode)
     (global-set-key "\C-xr\M-w" #'kill-rectangle-save)