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

Heavily redesign keybinding design

Browse source 
+ SPC and SPC m as leader/localleader (spacemacs-ey)
+ Move all custom keybindings to private +bindings.el file
+ Redesign+rearrange keybindings
This commit is contained in:
Henrik Lissner 2017-05-27 14:49:06 +02:00
parent 717d0ec06f
commit fbe782df22
13 changed files with 425 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/completion/company/config.el
View file

@ -41,34 +41,6 @@
(after! yasnippet
(nconc company-backends '(company-yasnippet)))
(map! (:map company-active-map
;; Don't interfere with `evil-delete-backward-word' in insert mode
"C-w" nil
"C-o" #'company-search-kill-others
"C-n" #'company-select-next
"C-p" #'company-select-previous
"C-h" #'company-quickhelp-manual-begin
"C-S-h" #'company-show-doc-buffer
"C-S-s" #'company-search-candidates
"C-s" #'company-filter-candidates
"C-SPC" #'company-complete-common
"C-h" #'company-quickhelp-manual-begin
[tab] #'company-complete-common-or-cycle
[backtab] #'company-select-previous
[escape] (λ! (company-abort) (evil-normal-state 1)))
;; Automatically applies to `company-filter-map'
(:map company-search-map
"C-n" #'company-search-repeat-forward
"C-p" #'company-search-repeat-backward
"C-s" (λ! (company-search-abort) (company-filter-candidates))
[escape] #'company-search-abort))
;; TAB auto-completion in term buffers
(after! comint
(map! :map comint-mode-map [tab] #'company-complete))
(global-company-mode +1))

18
modules/completion/ivy/config.el
View file

@ -40,19 +40,6 @@ session)."
(ivy-mode +1)
(map! :map ivy-minibuffer-map
[escape] #'keyboard-escape-quit
"M-v" #'yank
"M-z" #'undo
"C-r" #'evil-paste-from-register
"C-k" #'ivy-previous-line
"C-j" #'ivy-next-line
"C-l" #'ivy-alt-done
"C-w" #'+ivy/backward-kill-word
"C-u" #'doom/minibuffer-kill-line
"C-b" #'backward-word
"C-f" #'forward-word)
(map! :map ivy-mode-map
[remap describe-face] #'counsel-describe-face
[remap find-file] #'counsel-find-file
@ -99,11 +86,6 @@ session)."
cmd
'(("O" +ivy-git-grep-other-window-action "open in other window"))))
(map! :map counsel-ag-map
[backtab] #'+ivy/wgrep-occur ; search/replace on results
"C-SPC" #'counsel-git-grep-recenter ; preview
"M-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action))
(advice-add #'counsel-ag-function :override #'+ivy*counsel-ag-function))