emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[bepo] Split good and evil hooks

Browse source 
A few bindings and variables are useful for bepo users even without the
evil module activated
This commit is contained in:
Gerry Agbobada 2020-09-21 09:55:19 +02:00
parent 1456108d5b
commit 3c736f441b
No known key found for this signature in database
GPG key ID: BE26DBAFD866BE34
1 changed files with 102 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

201
modules/input/layout/+bepo.el
View file

@ -14,14 +14,9 @@
(set-face-attribute 'nobreak-space nil :underline t) (set-face-attribute 'nobreak-space nil :underline t)
(add-transient-hook! 'doom-init-modules-hook (add-transient-hook! 'doom-init-modules-hook
;; "ts" would be a little too common for an evil escape sequence
(setq evil-escape-key-sequence "gq")
(setq avy-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n) (setq avy-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n)
lispy-avy-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n ?m ?b ?é ?p ?o ?è ?v ?d ?l ?j ?z) lispy-avy-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n ?m ?b ?é ?p ?o ?è ?v ?d ?l ?j ?z))
evil-markdown-movement-bindings '((up . "s")
(down . "t")
(left . "c")
(right . "r")))
;; :ui window-select settings, ignoring +numbers flag for now ;; :ui window-select settings, ignoring +numbers flag for now
(after! ace-window (after! ace-window
(setq aw-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n))) (setq aw-keys '(?a ?u ?i ?e ?, ?c ?t ?s ?r ?n)))
@ -29,21 +24,6 @@
(setq switch-window-shortcut-style 'qwerty (setq switch-window-shortcut-style 'qwerty
switch-window-qwerty-shortcuts '("a" "u" "i" "e" "," "c" "t" "s" "r"))) switch-window-qwerty-shortcuts '("a" "u" "i" "e" "," "c" "t" "s" "r")))
(doom-bepo-rotate-ts-bare-keymap '(read-expression-map))
(doom-bepo-rotate-bare-keymap '(evil-window-map) doom-bepo-cr-rotation-style)
(map! :i "C-t" #'+default-newline
(:when (featurep! :editor multiple-cursors)
:prefix "gz"
:nv "t" #'evil-mc-make-cursor-move-next-line
:nv "s" #'evil-mc-make-cursor-move-prev-line
;; the old toggle mapping (t) is made available both on "T" for mnemonics and
;; "j" as a "classic" rotation
:nv "T" #'+multiple-cursors/evil-mc-toggle-cursors
:nv "j" #'+multiple-cursors/evil-mc-toggle-cursors)
(:when (featurep! :ui popup)
:n "C-$" #'+popup/toggle
:n "C-#" #'+popup/raise))
(map! (map!
:leader :leader
:desc "Window" "é" 'evil-window-map :desc "Window" "é" 'evil-window-map
@ -67,80 +47,103 @@
:desc "Jump to next hunk" ")" #'git-gutter:next-hunk :desc "Jump to next hunk" ")" #'git-gutter:next-hunk
:desc "Jump to previous hunk" "(" #'git-gutter:previous-hunk)) :desc "Jump to previous hunk" "(" #'git-gutter:previous-hunk))
(:prefix-map ("p" . "project") (:prefix-map ("p" . "project")
:desc "Browse other project" "»" #'doom/browse-in-other-project)) :desc "Browse other project" "»" #'doom/browse-in-other-project)))
(after! treemacs
(doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map))) (when (featurep! :editor evil)
(after! (:or helm ivy) (add-transient-hook! 'doom-init-modules-hook
(doom-bepo-rotate-bare-keymap ;; "ts" would be a little too common for an evil escape sequence
'(minibuffer-local-map (setq evil-escape-key-sequence "gq")
minibuffer-local-ns-map (setq evil-markdown-movement-bindings '((up . "s")
minibuffer-local-completion-map (down . "t")
minibuffer-local-must-match-map (left . "c")
minibuffer-local-isearch-map (right . "r")))
read-expression-map) (doom-bepo-rotate-ts-bare-keymap '(read-expression-map))
doom-bepo-cr-rotation-style)) (doom-bepo-rotate-bare-keymap '(evil-window-map) doom-bepo-cr-rotation-style)
(after! ivy (doom-bepo-rotate-evil-keymap doom-bepo-cr-rotation-style)
(doom-bepo-rotate-bare-keymap '(ivy-minibuffer-map ivy-switch-buffer-map) doom-bepo-cr-rotation-style))
(after! helm (map! :i "C-t" #'+default-newline
(doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style)) (:when (featurep! :editor multiple-cursors)
(after! helm-rg :prefix "gz"
(doom-bepo-rotate-bare-keymap '(helm-rg-map) doom-bepo-cr-rotation-style)) :nv "t" #'evil-mc-make-cursor-move-next-line
(after! helm-files :nv "s" #'evil-mc-make-cursor-move-prev-line
(doom-bepo-rotate-bare-keymap '(helm-read-file-map) doom-bepo-cr-rotation-style)) ;; the old toggle mapping (t) is made available both on "T" for mnemonics and
(after! general ;; "j" as a "classic" rotation
(doom-bepo-rotate-evil-keymap doom-bepo-cr-rotation-style)) :nv "T" #'+multiple-cursors/evil-mc-toggle-cursors
(after! company :nv "j" #'+multiple-cursors/evil-mc-toggle-cursors)
(doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style)) (:when (featurep! :ui popup)
(after! evil-snipe :n "C-$" #'+popup/toggle
(doom-bepo--evil-collection-hook :n "C-#" #'+popup/raise))
nil (after! treemacs
'(evil-snipe-local-mode-map evil-snipe-override-local-mode-map))) (doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map)))
(after! lispyville (after! (:or helm ivy)
;; <> en direct (doom-bepo-rotate-bare-keymap
(general-translate-key '(normal motion) 'lispyville-mode-map '(minibuffer-local-map
"«" "<" minibuffer-local-ns-map
"»" ">")) minibuffer-local-completion-map
(after! org minibuffer-local-must-match-map
(defadvice! doom-bepo--org-completing-read (&rest args) minibuffer-local-isearch-map
"Completing-read with SPACE being a normal character, and C-c mapping left alone." read-expression-map)
:override #'org-completing-read doom-bepo-cr-rotation-style))
(let ((enable-recursive-minibuffers t) (after! ivy
(minibuffer-local-completion-map (doom-bepo-rotate-bare-keymap '(ivy-minibuffer-map ivy-switch-buffer-map) doom-bepo-cr-rotation-style))
(copy-keymap minibuffer-local-completion-map))) (after! helm
(define-key minibuffer-local-completion-map " " 'self-insert-command) (doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style))
(define-key minibuffer-local-completion-map "?" 'self-insert-command) (after! helm-rg
(define-key minibuffer-local-completion-map (doom-bepo-rotate-bare-keymap '(helm-rg-map) doom-bepo-cr-rotation-style))
(cond (after! helm-files
((eq doom-bepo-cr-rotation-style 'ergodis) (doom-bepo-rotate-bare-keymap '(helm-read-file-map) doom-bepo-cr-rotation-style))
(kbd "C-l !")) (after! company
(t (doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style))
(kbd "C-h !"))) (after! evil-snipe
'org-time-stamp-inactive) (doom-bepo--evil-collection-hook
(apply #'completing-read args)))) nil
(after! (evil magit evil-magit) '(evil-snipe-local-mode-map evil-snipe-override-local-mode-map)))
(doom-bepo-rotate-ts-bare-keymap (after! lispyville
'(magit-mode-map ;; <> en direct
magit-diff-section-base-map (general-translate-key '(normal motion) 'lispyville-mode-map
magit-staged-section-map "«" "<"
magit-unstaged-section-map "»" ">"))
magit-untracked-section-map)) (after! org
;; Without this, "s" is mapped to 'magit-delete-thing (the old "k" for "kill") and (defadvice! doom-bepo--org-completing-read (&rest args)
;; takes precedence over the evil command to go up one line "Completing-read with SPACE being a normal character, and C-c mapping left alone."
(map! :map magit-mode-map "s" nil) :override #'org-completing-read
(doom-bepo--evil-collection-hook (let ((enable-recursive-minibuffers t)
nil (minibuffer-local-completion-map
'(magit-mode-map (copy-keymap minibuffer-local-completion-map)))
magit-cherry-mode-map (define-key minibuffer-local-completion-map " " 'self-insert-command)
magit-mode-map (define-key minibuffer-local-completion-map "?" 'self-insert-command)
magit-blob-mode-map (define-key minibuffer-local-completion-map
magit-diff-mode-map (cond
magit-log-mode-map ((eq doom-bepo-cr-rotation-style 'ergodis)
magit-log-select-mode-map (kbd "C-l !"))
magit-reflog-mode-map (t
magit-status-mode-map (kbd "C-h !")))
magit-file-mode-map 'org-time-stamp-inactive)
magit-log-read-revs-map (apply #'completing-read args))))
magit-process-mode-map (after! (evil magit evil-magit)
magit-refs-mode-map))) (doom-bepo-rotate-ts-bare-keymap
(after! evil-easymotion '(magit-mode-map
(doom-bepo-rotate-bare-keymap '(evilem-map) doom-bepo-cr-rotation-style))) magit-diff-section-base-map
magit-staged-section-map
magit-unstaged-section-map
magit-untracked-section-map))
;; Without this, "s" is mapped to 'magit-delete-thing (the old "k" for "kill") and
;; takes precedence over the evil command to go up one line
(map! :map magit-mode-map "s" nil)
(doom-bepo--evil-collection-hook
nil
'(magit-mode-map
magit-cherry-mode-map
magit-mode-map
magit-blob-mode-map
magit-diff-mode-map
magit-log-mode-map
magit-log-select-mode-map
magit-reflog-mode-map
magit-status-mode-map
magit-file-mode-map
magit-log-read-revs-map
magit-process-mode-map
magit-refs-mode-map)))
(after! evil-easymotion
(doom-bepo-rotate-bare-keymap '(evilem-map) doom-bepo-cr-rotation-style))))