From 39b355cfd37809de478831059ca5a2e624439c10 Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Fri, 5 Mar 2021 20:50:48 +0100 Subject: [PATCH 1/4] Fix #4736 - remap insert state bindings in minibuffer maps - Run `doom-bepo--evil-collection-hook` on all minibuffer maps. This allows all bindings in to be remapped in minibuffer contexts - Unmap `swiper-C-s` --- modules/input/layout/+bepo.el | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el index 1e9c53a8a..7624a372d 100644 --- a/modules/input/layout/+bepo.el +++ b/modules/input/layout/+bepo.el @@ -82,6 +82,14 @@ (after! treemacs (doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map))) (after! (:or helm ivy selectrum icomplete) + (doom-bepo--evil-collection-hook + nil + '(minibuffer-local-map + minibuffer-local-ns-map + minibuffer-local-completion-map + minibuffer-local-must-match-map + minibuffer-local-isearch-map + read-expression-map)) (doom-bepo-rotate-bare-keymap '(minibuffer-local-map minibuffer-local-ns-map @@ -91,7 +99,10 @@ read-expression-map) doom-bepo-cr-rotation-style)) (after! ivy - (doom-bepo-rotate-bare-keymap '(ivy-minibuffer-map ivy-switch-buffer-map) doom-bepo-cr-rotation-style)) + (doom-bepo-rotate-bare-keymap '(ivy-minibuffer-map ivy-switch-buffer-map) doom-bepo-cr-rotation-style) + (doom-bepo--evil-collection-hook nil '(ivy-minibuffer-map ivy-switch-buffer-map))) + (after! swiper + (map! :map swiper-map "C-s" nil)) (after! helm (doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style)) (after! helm-rg From 3acbf8e90de89858b3498ddb30cadc5fd76dd2a5 Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Fri, 5 Mar 2021 23:46:42 +0100 Subject: [PATCH 2/4] Apply changes to helm and selectrum maps --- modules/input/layout/+bepo.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el index 7624a372d..418f85277 100644 --- a/modules/input/layout/+bepo.el +++ b/modules/input/layout/+bepo.el @@ -104,11 +104,17 @@ (after! swiper (map! :map swiper-map "C-s" nil)) (after! helm - (doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style)) + (doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style) + (doom-bepo--evil-collection-hook nil '(helm-map))) (after! helm-rg - (doom-bepo-rotate-bare-keymap '(helm-rg-map) doom-bepo-cr-rotation-style)) + (doom-bepo-rotate-bare-keymap '(helm-rg-map) doom-bepo-cr-rotation-style) + (doom-bepo--evil-collection-hook nil '(helm-rg-map))) (after! helm-files - (doom-bepo-rotate-bare-keymap '(helm-read-file-map) doom-bepo-cr-rotation-style)) + (doom-bepo-rotate-bare-keymap '(helm-read-file-map) doom-bepo-cr-rotation-style) + (doom-bepo--evil-collection-hook nil '(helm-read-file-map))) + (after! selectrum + (doom-bepo-rotate-bare-keymap '(selectrum-minibuffer-map) doom-bepo-cr-rotation-style) + (doom-bepo--evil-collection-hook nil '(selectrum-minibuffer-map))) (after! company (doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style)) (after! evil-snipe From 9ac79c6e861ecfcf9b21f26678046f31b37dc536 Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Sat, 20 Mar 2021 02:19:18 +0100 Subject: [PATCH 3/4] =?UTF-8?q?fix(:input=20layout=20bepo):=20make=20evile?= =?UTF-8?q?m=20use=20g=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason, using only the `map!` call did not work, the reason is still unclear but calling the evilem-default-keybdings function worked so going with that. --- modules/input/layout/+bepo.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el index 418f85277..158c0a471 100644 --- a/modules/input/layout/+bepo.el +++ b/modules/input/layout/+bepo.el @@ -83,7 +83,7 @@ (doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map))) (after! (:or helm ivy selectrum icomplete) (doom-bepo--evil-collection-hook - nil + nil '(minibuffer-local-map minibuffer-local-ns-map minibuffer-local-completion-map @@ -225,5 +225,5 @@ (after! evil-easymotion ;; instead of using gs as the evilem-map we use gé to avoid conflicts with org-mode ;; down the road - (map! :nvm "gé" evilem-map) + (evilem-default-keybindings "gé") (doom-bepo-rotate-bare-keymap '(evilem-map) doom-bepo-cr-rotation-style)))) From ec26b91d3a0a4bf41ee6a0655f44c635592af9b4 Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Wed, 14 Apr 2021 09:34:27 +0200 Subject: [PATCH 4/4] Add outstanding issues sections for possible contributors This section is bound to be on Discourse later, keeping the list of TODOs that got notified on Discord here for now, not to forget --- modules/input/layout/README.org | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/input/layout/README.org b/modules/input/layout/README.org index d5d66e780..74debf0b5 100644 --- a/modules/input/layout/README.org +++ b/modules/input/layout/README.org @@ -117,6 +117,10 @@ actually put all the =c= functions on the key that does not need a curl. * Troubleshooting # Common issues and their solution, or places to look for help. +** Outstanding issues (contributions welcome) +*** Bépo +- in eshell, the key `c` is still bound to + `evil-collection-eshell-evil-change` in normal mode ** How to investigate an issue ? If a key is misbehaving, use =describe-key= (=C-h k= or =SPC h k= or =F1 k=) to see the functions bound to the key, and more importantly in which map it is