Merge 0c603895a3 into a4a61976dc

lisp/doom-keybinds.el

@@ -31,6 +31,21 @@ and Emacs states, and for non-evil users.")
 (defvar doom-leader-map (make-sparse-keymap)
   "An overriding keymap for <leader> keys.")
 
+(defvar doom-minibuffer-maps
+  (append '(minibuffer-local-map
+            minibuffer-local-ns-map
+            minibuffer-local-completion-map
+            minibuffer-local-must-match-map
+            minibuffer-local-isearch-map
+            read-expression-map)
+          (cond ((modulep! :completion ivy)
+                 '(ivy-minibuffer-map
+                   ivy-switch-buffer-map))
+                ((modulep! :completion helm)
+                 '(helm-map
+                   helm-rg-map
+                   helm-read-file-map))))
+  "A list of all the keymaps used for the minibuffer.")
 
 ;;
 ;;; Global keybind settings

modules/config/default/config.el

@@ -3,22 +3,7 @@
 (defvar +default-want-RET-continue-comments t
   "If non-nil, RET will continue commented lines.")
 
-(defvar +default-minibuffer-maps
-  (append '(minibuffer-local-map
-            minibuffer-local-ns-map
-            minibuffer-local-completion-map
-            minibuffer-local-must-match-map
-            minibuffer-local-isearch-map
-            read-expression-map)
-          (cond ((modulep! :completion ivy)
-                 '(ivy-minibuffer-map
-                   ivy-switch-buffer-map))
-                ((modulep! :completion helm)
-                 '(helm-map
-                   helm-rg-map
-                   helm-read-file-map))))
-  "A list of all the keymaps used for the minibuffer.")
-
+(defvaralias '+default-minibuffer-maps 'doom-minibuffer-maps)
 
 ;;
 ;;; Reasonable defaults

modules/editor/evil/config.el

@@ -642,3 +642,17 @@ don't offer any/enough real value to users.")
            :i "C-o"  #'completion-at-point
            :i "C-n"  #'cape-dabbrev
            :i "C-p"  #'+corfu/dabbrev-this-buffer))))
+
+
+(unless evil-disable-insert-state-bindings
+  (when (modulep! :completion corfu)
+    (define-key!
+      :keymaps (append doom-minibuffer-maps
+                       (when (modulep! :editor evil +everywhere)
+                         '(evil-ex-completion-map)))
+      "C-x C-f"  #'cape-file
+      "C-x s"    #'cape-dict
+      "C-x C-s"  #'yasnippet-capf
+      "C-x C-o"  #'completion-at-point
+      "C-x C-n"  #'cape-dabbrev
+      "C-x C-p"  #'+corfu/dabbrev-this-buffer)))