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

55
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,7 +47,32 @@
: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)))
(when (featurep! :editor evil)
(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 evil-markdown-movement-bindings '((up . "s")
(down . "t")
(left . "c")
(right . "r")))
(doom-bepo-rotate-ts-bare-keymap '(read-expression-map))
(doom-bepo-rotate-bare-keymap '(evil-window-map) doom-bepo-cr-rotation-style)
(doom-bepo-rotate-evil-keymap 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))
(after! treemacs (after! treemacs
(doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map))) (doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map)))
(after! (:or helm ivy) (after! (:or helm ivy)
@ -87,8 +92,6 @@
(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))
(after! helm-files (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))
(after! general
(doom-bepo-rotate-evil-keymap doom-bepo-cr-rotation-style))
(after! company (after! company
(doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style)) (doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style))
(after! evil-snipe (after! evil-snipe
@ -143,4 +146,4 @@
magit-process-mode-map magit-process-mode-map
magit-refs-mode-map))) magit-refs-mode-map)))
(after! evil-easymotion (after! evil-easymotion
(doom-bepo-rotate-bare-keymap '(evilem-map) doom-bepo-cr-rotation-style))) (doom-bepo-rotate-bare-keymap '(evilem-map) doom-bepo-cr-rotation-style))))