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

Minimalize my-bindings for testing

Browse source
This commit is contained in:
Henrik Lissner 2017-01-16 23:28:17 -05:00
parent 0470a6fa0c
commit ba1db18a4d
1 changed files with 220 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

496
private/my-bindings.el
View file

@ -1,22 +1,17 @@
;;; my-bindings.el ;;; my-bindings.el --- description
(eval-when-compile (require 'core-defuns))
(defmacro @find-file-in (path &optional project-p) (defmacro @find-file-in (path &optional project-p)
"Returns a interactive function for searching files" "Returns a interactive function for searching files"
`(lambda () (interactive) `(lambda () (interactive)
(let ((default-directory ,path)) (let ((default-directory ,path))
(,@(if project-p ,(if project-p
'(counsel-projectile-find-file) '(call-interactively 'projectile-find-file)
'(call-interactively 'counsel-find-file) '(counsel-find-file)))))
)))))
(map! [f9] 'what-face (map! [f9] 'what-face
;; Essential ;; Essential
"M-x" 'smex ;; "M-x" 'counsel-M-x
"A-x" 'smex ;; "A-x" 'counsel-M-x
"M-X" 'smex-major-mode-commands
"A-X" 'smex-major-mode-commands
"M-;" 'eval-expression "M-;" 'eval-expression
"A-;" 'eval-expression "A-;" 'eval-expression
;; Tools ;; Tools
@ -30,42 +25,34 @@
"M-=" 'text-scale-increase "M-=" 'text-scale-increase
"M--" 'text-scale-decrease "M--" 'text-scale-decrease
;; Simple window navigation/manipulation ;; Simple window navigation/manipulation
"M-t" 'doom:tab-create "M-t" 'doom:workspace-new
"M-T" 'doom/tab-display "M-T" 'doom/workspace-display
"M-w" 'doom/close-window-or-tab "M-w" 'doom/workspace-or-window-close
"M-W" 'delete-frame "M-W" 'doom/workspace-close-frame
"M-n" 'doom/new-buffer "M-n" 'evil-buffer-new
"M-N" 'doom/new-frame "M-N" 'doom/workspace-new-frame
"C-j" 'evil-window-down "C-j" 'evil-window-down
"C-k" 'evil-window-up "C-k" 'evil-window-up
"C-h" 'evil-window-left "C-h" 'evil-window-left
"C-l" 'evil-window-right "C-l" 'evil-window-right
"A-C-j" 'doom/evil-window-resize-d
"A-C-k" 'doom/evil-window-resize-u
"A-C-h" 'doom/evil-window-resize-l
"A-C-l" 'doom/evil-window-resize-r
;; Temporary escape into emacs mode ;; Temporary escape into emacs mode
[C-escape] 'evil-emacs-state [C-escape] 'evil-emacs-state
:e [C-escape] 'evil-normal-state :e [C-escape] 'evil-normal-state
;; Basic keys for emacs mode ;; Basic escape keys for emacs mode
:e "h" 'evil-backward-char
:e "j" 'evil-next-line
:e "k" 'evil-previous-line
:e "l" 'evil-forward-char
:e "C-h" 'evil-window-left :e "C-h" 'evil-window-left
:e "C-j" 'evil-window-down :e "C-j" 'evil-window-down
:e "C-k" 'evil-window-up :e "C-k" 'evil-window-up
:e "C-l" 'evil-window-right :e "C-l" 'evil-window-right
;; Switching tabs (workgroups) ;; Switching tabs (workgroups)
:m "C-1" (λ! (doom:switch-to-tab 0)) "M-1" (λ! (doom/workspace-activate-at 0))
:m "C-2" (λ! (doom:switch-to-tab 1)) "M-2" (λ! (doom/workspace-activate-at 1))
:m "C-3" (λ! (doom:switch-to-tab 2)) "M-3" (λ! (doom/workspace-activate-at 2))
:m "C-4" (λ! (doom:switch-to-tab 3)) "M-4" (λ! (doom/workspace-activate-at 3))
:m "C-5" (λ! (doom:switch-to-tab 4)) "M-5" (λ! (doom/workspace-activate-at 4))
:m "C-6" (λ! (doom:switch-to-tab 5)) "M-6" (λ! (doom/workspace-activate-at 5))
:m "C-7" (λ! (doom:switch-to-tab 6)) "M-7" (λ! (doom/workspace-activate-at 6))
:m "C-8" (λ! (doom:switch-to-tab 7)) "M-8" (λ! (doom/workspace-activate-at 7))
:m "C-9" (λ! (doom:switch-to-tab 8)) "M-9" (λ! (doom/workspace-activate-at 8))
[M-backspace] 'doom/backward-kill-to-bol-and-indent [M-backspace] 'doom/backward-kill-to-bol-and-indent
[A-left] 'backward-word [A-left] 'backward-word
@ -76,262 +63,219 @@
"M-q" 'save-buffers-kill-emacs "M-q" 'save-buffers-kill-emacs
"M-s" 'save-buffer "M-s" 'save-buffer
"M-v" 'clipboard-yank "M-v" 'clipboard-yank
"M-z" 'undo "M-z" 'undo-tree-undo
"M-Z" 'redo "M-Z" 'undo-tree-redo
"C-M-f" 'doom/toggle-fullscreen "C-M-f" 'doom-ui-toggle-fullscreen
:m "A-j" 'doom/multi-next-line :m "A-j" 'doom:multi-next-line
:m "A-k" 'doom/multi-previous-line :m "A-k" 'doom:multi-previous-line
:n "M-r" 'doom:eval-buffer :n "M-r" 'doom:eval-buffer
:v "M-r" 'doom:eval-region :v "M-r" 'doom:eval-region
:ni [M-f1] 'doom:docs-lookup :ni [M-f1] 'doom:docs-lookup
;; Textmate-esque indent shift left/right
:i "M-]" 'doom/smart-indent
:i "M-[" 'doom/dumb-dedent
;; Restore osx text objects
:i [A-backspace] 'evil-delete-backward-word
:i [A-delete] 'doom/delete-forward-word
;;; <leader> and <localleader> ;;; <leader> and <localleader>
:m ";" 'evil-ex :m ";" 'evil-ex
(:leader ;; (:leader
:nv "," 'doom/ivy-switch-project-buffer ; or 'helm-buffers-list ;; :nv "," 'projectile-switch-to-buffer
:nv "<" 'doom/ivy-switch-buffer ; or 'helm-mini ;; :nv "<" 'ivy-switch-buffer
:nv "." (@find-file-in default-directory) ;; :nv "." (@find-file-in default-directory)
:nv "/" (@find-file-in (doom/project-root) t) ;; :nv "/" 'counsel-projectile-find-file
:nv ">" 'projectile-find-file-in-known-projects ;; :n ":" 'ivy-imenu-anywhere
:n ":" 'imenu-list-minor-mode ; or 'helm-semantic-or-imenu ;; :nv ";" 'counsel-imenu
:nv ";" 'counsel-imenu ;; :v "=" 'align-regexp
:v "=" 'align-regexp ;; :nv "a" 'projectile-find-other-file
:nv "a" 'projectile-find-other-file ;; :n "b" 'counsel-bookmark
:n "b" 'counsel-bookmark ; or 'helm-bookmarks ;; :n "B" 'bookmark-delete
:n "B" 'bookmark-delete ;; :n "e" 'doom/flycheck-errors
:n "e" 'doom/flycheck-errors ;; :n "k" 'doom:docs-lookup
:n "k" 'doom:docs-lookup ;; :nv "l" 'doom/nlinum-toggle
:nv "l" 'doom/nlinum-toggle ;; :nv "m" 'counsel-recentf
:nv "m" 'counsel-recentf ; or 'helm-recentf ;; :nv "M" 'projectile-recentf
:nv "M" 'projectile-recentf ;; :nv "p" 'counsel-yank-pop
:nv "p" 'counsel-yank-pop ;; :nv "P" 'counsel-projectile-switch-project
:nv "P" 'counsel-projectile-switch-project ; or 'helm-projectile-switch-project ;; :n "r" 'emr-show-refactor-menu
:n "r" 'emr-show-refactor-menu ;; :n "R" 'doom-ui-reset-theme
:n "R" 'doom/reset-theme ;; :n "s" 'yas-visit-snippet-file
:n "s" 'yas-visit-snippet-file ;; :n "S" 'doom/yas-find-file
:n "S" 'doom/yas-find-file ;; ;; Quick quitting
;; Quick quitting ;; :nv "Q" 'evil-save-and-quit
:nv "Q" 'evil-save-and-quit ;; :nv "C-q" 'doom/kill-workgroup-and-quit
:nv "C-q" 'doom/kill-workgroup-and-quit ;; ;; Quick access to config files
;; Quick access to config files ;; :nv "E" (@find-file-in doom-emacs-dir t)
:nv "E" (@find-file-in doom-emacs-dir t) ;; :nv "\\" (@find-file-in (f-expand ".dotfiles" "~") t)
:nv "\\" (@find-file-in (f-expand ".dotfiles" "~") t) ;; ;; Alternative to C-h (used as window shortcut)
;; Alternative to C-h (used as window shortcut) ;; :n "h" 'help-command
:n "h" 'help-command ;; (:prefix "d" ; <diff>
(:prefix "d" ; <diff> ;; :n "." 'git-gutter:popup-hunk
:n "." 'doom/vcs-show-hunk ;; :n "/" 'vc-diff
:n "/" 'vc-diff ;; :n "d" 'magit-status
:n "d" 'magit-status ;; :n "D" 'git-messenger:popup-message
:n "D" 'git-messenger:popup-message ;; :n "s" 'git-gutter:stage-hunk
:n "s" 'doom/vcs-stage-hunk ;; :v "s" 'magit-stage
:v "s" 'magit-stage ;; :v "S" 'magit-stage
:v "S" 'magit-stage ;; :n "r" 'git-gutter:revert-hunk
:n "r" 'doom/vcs-revert-hunk ;; :n "A" 'vc-annotate)
:n "A" 'vc-annotate) ;; (:prefix "t" ; <tmux>
(:prefix "t" ; <tmux> ;; :n "." 'doom/tmux-cd-to-here
:n "." 'doom/tmux-cd-to-here ;; :n "/" 'doom/tmux-cd-to-project
:n "/" 'doom/tmux-cd-to-project ;; :v "r" 'doom:tmux)
:v "r" 'doom:tmux) ;; (:prefix "o" ; <os>
(:prefix "o" ; <os> ;; :n "o" 'os-open-in-default-program
:n "o" 'os-open-in-default-program ;; :n "r" 'os-reveal
:n "r" 'os-reveal ;; :n "p" 'os-reveal-project
:n "p" 'os-reveal-project ;; :n "b" 'os-open-in-browser
:n "b" 'os-open-in-browser ;; :n "u" 'os-upload
:n "u" 'os-upload ;; :n "U" 'os-upload-folder
:n "U" 'os-upload-folder ;; :n "t" 'os-switch-to-term
:n "t" 'os-switch-to-term ;; :n "T" 'os-switch-to-term-and-cd
:n "T" 'os-switch-to-term-and-cd ;; (:when IS-MAC
(:when IS-MAC ;; :n "l" 'os-send-to-launchbar
:n "l" 'os-send-to-launchbar ;; :n "L" 'os-send-project-to-launchbar))
:n "L" 'os-send-project-to-launchbar)) ;; (:prefix "x" ; <org>
(:prefix "x" ; <org> ;; :n "x" 'doom/org
:n "x" 'doom/org ;; :n "." (@find-file-in org-directory)
:n "." (@find-file-in org-directory) ;; :n "/" (@find-file-in org-directory t)
:n "/" (@find-file-in org-directory t) ;; :n "e" (@find-file-in org-export-directory)))
:n "e" (@find-file-in org-export-directory)))
(:localleader ;; (:localleader
:n "\\" 'doom/neotree ;; :n "\\" 'doom/neotree
:n "b" 'doom:build ;; :n "b" 'doom:build
:n "R" 'doom:repl ;; :n "R" 'doom:repl
:v "R" 'doom:repl-eval) ;; :v "R" 'doom:repl-eval
;; ;;; conventions
;; ;; ; appends a terminator to line
;; ;; tt rerun last test
;; ;; tr run current module
;; ;; ta run all modules
;; ;; ts run single test
;; ;; anything else is fair game
;; )
;;; Evil-esque bindings ;; ;;; Evil-esque bindings
;; Yank to EOL ;; ;; Yank to EOL
:n "Y" "y$" ;; :n "Y" "y$"
;; Don't move cursor on indent ;; ;; Don't move cursor on indent
:n "=" 'doom/static-reindent ;; :n "=" 'doom/static-reindent
:v "=" 'evil-indent ;; :v "=" 'evil-indent
;; Folding ;; ;; Folding
:n "zr" 'doom/evil-open-folds ;; :n "zr" 'doom:evil-open-folds-recursively
:n "zm" 'doom/evil-close-folds ;; :n "zm" 'doom:evil-close-folds-recursively
:n "zx" 'doom/kill-real-buffer ;; :n "zx" 'doom/kill-real-buffer
;; Buffers ;; ;; Buffers
:n "ZX" 'bury-buffer ;; :n "ZX" 'bury-buffer
:n "]b" 'doom/next-real-buffer ;; :n "]b" 'doom/next-real-buffer
:n "[b" 'doom/previous-real-buffer ;; :n "[b" 'doom/previous-real-buffer
;; Diffs ;; ;; Diffs
:m "]d" 'doom/vcs-next-hunk ;; :m "]d" 'git-gutter:next-hunk
:m "[d" 'doom/vcs-prev-hunk ;; :m "[d" 'git-gutter:previous-hunk
:m "]e" 'doom/flycheck-next-error ;; :m "]e" 'doom/flycheck-next-error
:m "[e" 'doom/flycheck-previous-error ;; :m "[e" 'doom/flycheck-previous-error
;; Switch tabs ;; ;; Switch tabs
:n "]w" 'doom:switch-to-workgroup-right ;; :n "]w" 'doom:workspace-switch-right
:n "[w" 'doom:switch-to-workgroup-left ;; :n "[w" 'doom:workspace-switch-left
:m "gt" 'doom:switch-to-workgroup-right ;; :m "gt" 'doom:workspace-switch-right
:m "gT" 'doom:switch-to-workgroup-left ;; :m "gT" 'doom:workspace-switch-left
;; Increment/decrement number under cursor ;; ;; Increment/decrement number under cursor
:n "g=" 'evil-numbers/inc-at-pt ;; :n "g=" 'evil-numbers/inc-at-pt
:n "g-" 'evil-numbers/dec-at-pt ;; :n "g-" 'evil-numbers/dec-at-pt
:n "gf" 'find-file-at-point ;; :n "gf" 'find-file-at-point
;; Navigation ;; ;; Navigation
:nv "K" 'smart-up ;; :nv "gK" 'smart-up
:m "gD" 'doom/find-def ;; :m "gD" 'doom/find-def
:n "gp" 'doom/reselect-paste ;; :n "gp" 'doom/editor-reselect-paste
:n "gc" 'evil-commentary ;; :n "gc" 'evil-commentary
:n "gx" 'evil-exchange ;; :n "gx" 'evil-exchange
:n "gr" 'doom:eval-region ;; :n "gr" 'doom:eval-region
:n "gR" 'doom:eval-buffer ;; :n "gR" 'doom:eval-buffer
:v "gR" 'doom:eval-region-and-replace ;; :v "gR" 'doom:eval-region-and-replace
:m "g]" 'smart-forward ;; :m "g]" 'smart-forward
:m "g[" 'smart-backward ;; :m "g[" 'smart-backward
:v "@" 'doom/evil-macro-on-all-lines ;; :v "@" 'doom:evil-macro-on-all-lines
:n "g@" 'doom/evil-macro-on-all-lines ;; :n "g@" 'doom:evil-macro-on-all-lines
;; Repeat in visual mode ;; ;; Repeat in visual mode
:v "." 'evil-repeat ;; :v "." 'evil-repeat
;; vnoremap < <gv ;; ;; vnoremap < <gv
:v "<" (λ! (evil-shift-left (region-beginning) (region-end)) ;; :v "<" (λ! (evil-shift-left (region-beginning) (region-end))
(evil-normal-state) ;; (evil-normal-state)
(evil-visual-restore)) ;; (evil-visual-restore))
;; vnoremap > >gv ;; ;; vnoremap > >gv
:v ">" (λ! (evil-shift-right (region-beginning) (region-end)) ;; :v ">" (λ! (evil-shift-right (region-beginning) (region-end))
(evil-normal-state) ;; (evil-normal-state)
(evil-visual-restore)) ;; (evil-visual-restore))
;; undo/redo for regions (NOTE: Buggy!) ;; ;; undo/redo for regions (NOTE: Buggy!)
:nv "u" 'undo-tree-undo ;; :nv "u" 'undo-tree-undo
:nv "C-r" 'undo-tree-redo ;; :nv "C-r" 'undo-tree-redo
;; paste from recent yank register (which isn't overwritten) ;; ;; paste from recent yank register (which isn't overwritten)
:v "C-p" "\"0p" ;; :v "C-p" "\"0p"
(:map evil-window-map ; prefix "C-w" ;; (:map evil-window-map ; prefix "C-w"
;; Navigation ;; ;; Navigation
"C-h" 'evil-window-left ;; "C-h" 'evil-window-left
"C-j" 'evil-window-down ;; "C-j" 'evil-window-down
"C-k" 'evil-window-up ;; "C-k" 'evil-window-up
"C-l" 'evil-window-right ;; "C-l" 'evil-window-right
"C-w" 'ace-window ;; "C-w" 'ace-window
;; Swapping windows ;; ;; Swapping windows
"H" 'doom/evil-window-move-l ;; "H" (λ! (doom-evil-window-move 'left))
"J" 'doom/evil-window-move-d ;; "J" (λ! (doom-evil-window-move 'down))
"K" 'doom/evil-window-move-u ;; "K" (λ! (doom-evil-window-move 'up))
"L" 'doom/evil-window-move-r ;; "L" (λ! (doom-evil-window-move 'right))
"C-S-w" (λ! (ace-window 4)) ;; "C-S-w" (λ! (ace-window 4))
;; Window undo/redo ;; ;; Window undo/redo
"u" 'doom/undo-window-change ;; "u" 'doom/workspace-undo
"C-u" 'doom/undo-window-change ;; "C-u" 'doom/workspace-undo
"C-r" 'doom/redo-window-change ;; "C-r" 'doom/workspace-redo
;; Delete window ;; "o" 'doom/evil-window-zoom
"C-C" (λ! (ace-window 16))) ;; ;; Delete window
;; "C-C" (λ! (ace-window 16)))
;;; Plugins ;; ;;; Plugins
;; evil-visual-star ;; ;; evil-visual-star
:v "*" 'evil-visualstar/begin-search-forward ;; :v "*" 'evil-visualstar/begin-search-forward
:v "#" 'evil-visualstar/begin-search-backward ;; :v "#" 'evil-visualstar/begin-search-backward
;; evil-multiedit ;; ;; evil-multiedit
:v "R" 'evil-multiedit-match-all ;; :v "R" 'evil-multiedit-match-all
:n "M-C-D" 'evil-multiedit-restore ;; :n "M-C-D" 'evil-multiedit-restore
:n "M-d" 'evil-multiedit-match-symbol-and-next ;; :n "M-d" 'evil-multiedit-match-symbol-and-next
:n "M-D" 'evil-multiedit-match-symbol-and-prev ;; :n "M-D" 'evil-multiedit-match-symbol-and-prev
:v "M-d" 'evil-multiedit-match-and-next ;; :v "M-d" 'evil-multiedit-match-and-next
:v "M-D" 'evil-multiedit-match-and-prev ;; :v "M-D" 'evil-multiedit-match-and-prev
;; evil-surround ;; ;; evil-surround
:v "S" 'evil-surround-region ;; :v "S" 'evil-surround-region
:o "s" 'evil-surround-edit ;; :o "s" 'evil-surround-edit
:o "S" 'evil-Surround-edit ;; :o "S" 'evil-Surround-edit
;; expand-region ;; ;; expand-region
:v "v" 'er/expand-region ;; :v "v" 'er/expand-region
:v "V" 'er/contract-region ;; :v "V" 'er/contract-region
;; evil-matchit ;; ;; evil-matchit
:m "%" 'evilmi-jump-items ;; :m "%" 'evilmi-jump-items
;; ;; hide-show/evil-matchit
;; :m "<tab>" 'doom/evil-matchit-or-toggle-fold
;; ;; rotate-text
;; :n "!" 'rotate-text
;; hide-show/evil-matchit ;; ;; help-mode
:m "<tab>" 'doom/evil-matchit ;; (:after help-mode
;; rotate-text ;; (:map help-map
:n "!" 'rotate-text ;; "e" 'doom/popup-messages)
;; (:map help-mode-map
;; :n "]]" 'help-go-forward
;; :n "[[" 'help-go-back
;; :n "o" 'ace-link-help))
;; auto-yasnippet ;; ;;; Insert mode hacks
:i "<C-tab>" 'aya-expand ;; ;; Textmate-esque newlines
:nv "<C-tab>" 'aya-create ;; :i [backspace] 'delete-backward-char
;; :i [M-backspace] 'doom/backward-kill-to-bol-and-indent
;; yasnippet ;; :i [C-return] (λ! (evil-open-below 1))
(:after yasnippet ;; ;; Emacsien motions for insert mode
(:map yas-minor-mode-map ;; :i "C-b" 'backward-word
:i [tab] 'yas-expand ;; :i "C-f" 'forward-word
:v [tab] 'doom/yas-insert-snippet)) ;; ;; escape from insert mode (more responsive than using key-chord-define)
;; :irv "C-g" 'evil-normal-state
;; company-mode and vim-like omni-complete )
:i "C-SPC" 'doom/company-complete
(:prefix "C-x"
:i "C-l" 'doom/company-whole-lines
:i "C-k" 'doom/company-dict-or-keywords
:i "C-f" 'company-files
:i "C-]" 'company-tags
:i "s" 'company-ispell
:i "C-s" 'company-yasnippet
:i "C-o" 'company-capf
:i "C-n" 'company-dabbrev-code
:i "C-p" (λ! (let ((company-selection-wrap-around t))
(call-interactively 'company-dabbrev-code)
(company-select-previous-or-abort))))
(:after company
(:map company-active-map
"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-or-cycle
[tab] 'doom/company-complete-common-or-complete-full
[backtab] 'company-select-previous
[escape] (λ! (company-abort) (evil-normal-state 1))
[C-return] 'counsel-company)
(:map company-search-map
"C-n" 'company-search-repeat-forward
"C-p" 'company-search-repeat-backward
[escape] 'company-search-abort))
;; help-mode
(:after help-mode
(:map help-map
"e" 'doom/popup-messages)
(:map help-mode-map
:n "]]" 'help-go-forward
:n "[[" 'help-go-back
:n "o" 'ace-link-help))
;;; Insert mode hacks
;; Textmate-esque newlines
:i [backspace] 'delete-backward-char
:i [M-backspace] 'doom/backward-kill-to-bol-and-indent
:i [C-return] (λ! (evil-open-below 1))
;; Emacsien motions for insert mode
:i "C-b" 'backward-word
:i "C-f" 'forward-word
;; escape from insert mode (more responsive than using key-chord-define)
:irv "C-g" 'evil-normal-state)
(provide 'my-bindings) (provide 'my-bindings)
;;; my-bindings.el ends here