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

bind! -> map!; new minimalistic keybinding macro

Browse source
This commit is contained in:
Henrik Lissner 2015-11-30 05:31:20 -05:00
parent 2e4a083bbb
commit 81df2830a9
19 changed files with 431 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/module-csharp.el
View file

@ -18,11 +18,12 @@
:init
(add-hook! csharp-mode '(emr-initialize omnisharp-mode))
:config
(evil-define-key 'normal omnisharp-mode-map
(kbd "gd") 'omnisharp-go-to-definition
(kbd ",tr") (λ (omnisharp-unit-test "fixture"))
(kbd ",ts") (λ (omnisharp-unit-test "single"))
(kbd ",ta") (λ (omnisharp-unit-test "all")))
(map! :map omnisharp-mode-map
"gd" 'omnisharp-go-to-definition
(:prefix "\\"
"tr" (λ (omnisharp-unit-test "fixture"))
"ts" (λ (omnisharp-unit-test "single"))
"ta" (λ (omnisharp-unit-test "all"))))
(after! company
(define-company-backend! csharp-mode (omnisharp))

14
modules/module-eshell.el
View file

@ -26,13 +26,13 @@
;; em-prompt
(setq eshell-prompt-function 'narf/eshell-prompt)
(bind! :map eshell-mode-map
:n "i" 'narf/eshell-evil-prepend-maybe
:n "I" 'narf/eshell-evil-prepend
:n "a" 'narf/eshell-evil-append-maybe
:n "A" 'narf/eshell-evil-append
:n "r" 'narf/eshell-evil-replace-maybe
:n "R" 'narf/eshell-evil-replace-state-maybe))
(map! :map eshell-mode-map
:n "i" 'narf/eshell-evil-prepend-maybe
:n "I" 'narf/eshell-evil-prepend
:n "a" 'narf/eshell-evil-append-maybe
:n "A" 'narf/eshell-evil-append
:n "r" 'narf/eshell-evil-replace-maybe
:n "R" 'narf/eshell-evil-replace-state-maybe))
(provide 'module-eshell)
;;; module-eshell.el ends here

16
modules/module-go.el
View file

@ -36,14 +36,14 @@
:config
(define-company-backend! go-mode (go yasnippet)))
(bind!
(:map go-mode-map
:n "gd" 'godef-jump
:n "gD" 'godef-describe
:n ",i" 'helm-go-package
:n ",tr" 'narf:go-test-run-all
:n ",ta" 'narf:go-test-run-all
:n ",ts" 'narf:go-test-run-package)))
(map! :map go-mode-map
:n "gd" 'godef-jump
:n "gD" 'godef-describe
(:localleader
:n "p" 'helm-go-package
:n "tr" 'narf:go-test-run-all
:n "ta" 'narf:go-test-run-all
:n "ts" 'narf:go-test-run-package)))
(provide 'module-go)
;;; module-go.el ends here

2
modules/module-java.el
View file

@ -23,7 +23,7 @@
:functions company-emacs-eclim-setup
:config (company-emacs-eclim-setup)))
(bind! :map java-mode-map :m "gd" 'eclim-java-find-declaration))
(map! :map java-mode-map :m "gd" 'eclim-java-find-declaration))
(use-package android-mode
:commands android-mode

2
modules/module-js.el
View file

@ -16,7 +16,7 @@
(after! web-beautify
(add-hook! js2-mode (setenv "jsbeautify_indent_size" "4"))
(bind! :map js2-mode-map :m "gQ" 'web-beautify-js))
(map! :map js2-mode-map :m "gQ" 'web-beautify-js))
(use-package js2-refactor
:init (add-hook! js2-mode 'emr-initialize)

8
modules/module-lisp.el
View file

@ -22,7 +22,7 @@
;; Highlight extra NARF keywords
(let ((keywords '("add-hook!"
"bind!"
"map!"
"after!"
"λ"
"in!"
@ -38,9 +38,9 @@
'emacs-lisp-mode `(("\\(lambda\\)" (0 (narf/show-as ?λ)))))
;; Real go-to-definition for elisp
(bind! :map emacs-lisp-mode-map
:m "gd" 'narf/elisp-find-function-at-pt
:m "gD" 'narf/elisp-find-function-at-pt-other-window)
(map! :map emacs-lisp-mode-map
:m "gd" 'narf/elisp-find-function-at-pt
:m "gD" 'narf/elisp-find-function-at-pt-other-window)
(use-package slime :defer t
:config

37
modules/module-markdown.el
View file

@ -14,29 +14,30 @@
(add-hook! markdown-mode
(exmap! "preview" 'narf/markdown-preview)
(exmap! "export" 'narf:org-export))
(bind! (:map markdown-mode-map
"<backspace>" nil
"<M-left>" nil
"<M-right>" nil
(map! (:map markdown-mode-map
"<backspace>" nil
"<M-left>" nil
"<M-right>" nil
;; Assumes you have a markdown renderer plugin in chrome
:nv "M-r" (λ (narf-open-with "Google Chrome"))
;; Assumes you have a markdown renderer plugin in chrome
:nv "M-r" (λ (narf-open-with "Google Chrome"))
"M-*" 'markdown-insert-list-item
"M-b" 'markdown-insert-bold
"M-i" 'markdown-insert-italic
"M-`" 'narf/markdown-insert-del
"M-*" 'markdown-insert-list-item
"M-b" 'markdown-insert-bold
"M-i" 'markdown-insert-italic
"M-`" 'narf/markdown-insert-del
:nv ",i" 'markdown-insert-image
:nv ",l" 'markdown-insert-link
:nv ",L" 'markdown-insert-reference-link-dwim
:nv ",b" 'markdown-preview
(:localleader
:nv "i" 'markdown-insert-image
:nv "l" 'markdown-insert-link
:nv "L" 'markdown-insert-reference-link-dwim
:nv "b" 'markdown-preview)
;; TODO: Make context sensitive
:n "[p" 'markdown-promote
:n "]p" 'markdown-demote
;; TODO: Make context sensitive
:n "[p" 'markdown-promote
:n "]p" 'markdown-demote
:i "M--" 'markdown-insert-hr)))
:i "M--" 'markdown-insert-hr)))
;; TODO: Test previewing capability

199
modules/module-org.el
View file

@ -399,117 +399,128 @@ will function properly."
(define-key org-mode-map (kbd "C-j") nil)
(define-key org-mode-map (kbd "C-k") nil)
;; Keybinds
(bind! (:map org-mode-map
:i [remap narf/inflate-space-maybe] 'org-self-insert-command
:i "RET" 'org-return-indent)
(map! (:map org-mode-map
:i [remap narf/inflate-space-maybe] 'org-self-insert-command
:i "RET" 'org-return-indent)
(:map evil-org-mode-map
:ni "A-l" 'org-metaright
:ni "A-h" 'org-metaleft
:ni "A-k" 'org-metaup
:ni "A-j" 'org-metadown
;; Expand tables (or shiftmeta move)
:ni "A-L" 'narf/org-table-append-field-or-shift-right
:ni "A-H" 'narf/org-table-prepend-field-or-shift-left
:ni "A-K" 'narf/org-table-prepend-row-or-shift-up
:ni "A-J" 'narf/org-table-append-row-or-shift-down
(:map evil-org-mode-map
:ni "A-l" 'org-metaright
:ni "A-h" 'org-metaleft
:ni "A-k" 'org-metaup
:ni "A-j" 'org-metadown
;; Expand tables (or shiftmeta move)
:ni "A-L" 'narf/org-table-append-field-or-shift-right
:ni "A-H" 'narf/org-table-prepend-field-or-shift-left
:ni "A-K" 'narf/org-table-prepend-row-or-shift-up
:ni "A-J" 'narf/org-table-append-row-or-shift-down
:i "C-L" 'narf/org-table-next-field
:i "C-H" 'narf/org-table-previous-field
:i "C-K" 'narf/org-table-previous-row
:i "C-J" 'narf/org-table-next-row
:i "C-L" 'narf/org-table-next-field
:i "C-H" 'narf/org-table-previous-field
:i "C-K" 'narf/org-table-previous-row
:i "C-J" 'narf/org-table-next-row
:i "C-e" 'org-end-of-line
:i "C-a" 'org-beginning-of-line
:i "C-e" 'org-end-of-line
:i "C-a" 'org-beginning-of-line
:nv "j" 'evil-next-visual-line
:nv "k" 'evil-previous-visual-line
:v "<S-tab>" 'narf/yas-insert-snippet
:nv "j" 'evil-next-visual-line
:nv "k" 'evil-previous-visual-line
:v "<S-tab>" 'narf/yas-insert-snippet
:i "M-a" (λ (evil-visual-state) (org-mark-element))
:n "M-a" 'org-mark-element
:v "M-a" 'mark-whole-buffer
:i "M-a" (λ (evil-visual-state) (org-mark-element))
:n "M-a" 'org-mark-element
:v "M-a" 'mark-whole-buffer
:ni "<M-return>" (λ (narf/org-insert-item 'below))
:ni "<S-M-return>" (λ (narf/org-insert-item 'above))
:ni "<M-return>" (λ (narf/org-insert-item 'below))
:ni "<S-M-return>" (λ (narf/org-insert-item 'above))
:i "M-b" (λ (narf/org-surround "*")) ; bold
:i "M-u" (λ (narf/org-surround "_")) ; underline
:i "M-i" (λ (narf/org-surround "/")) ; italics
:i "M-`" (λ (narf/org-surround "+")) ; strikethrough
:i "M-b" (λ (narf/org-surround "*")) ; bold
:i "M-u" (λ (narf/org-surround "_")) ; underline
:i "M-i" (λ (narf/org-surround "/")) ; italics
:i "M-`" (λ (narf/org-surround "+")) ; strikethrough
:v "M-b" "S*"
:v "M-u" "S_"
:v "M-i" "S/"
:v "M-`" "S+"
:v "M-b" "S*"
:v "M-u" "S_"
:v "M-i" "S/"
:v "M-`" "S+"
:n ",;" 'helm-org-in-buffer-headings
:nv ",l" 'org-insert-link
:n ",L" 'org-store-link
;; TODO narf/org-replace-link-by-link-description
:n ",=" 'org-align-all-tags
:n ",f" 'org-sparse-tree
:n ",?" 'org-tags-view
:n ",e" 'org-edit-special
:n ",a" 'org-agenda
:n ",D" 'org-time-stamp-inactive
:n ",i" 'narf/org-toggle-inline-images-at-point
:n ",t" 'org-todo
:n ",T" 'org-show-todo-tree
:n ",d" 'org-time-stamp
:n ",r" 'org-refile
:n ",s" 'org-schedule
:n ",oa" 'narf/org-attachment-reveal
:n ", SPC" 'narf/org-toggle-checkbox
:n ", RET" 'org-archive-subtree
(:leader
:n ";" 'helm-org-in-buffer-headings
:n "oa" 'narf/org-attachment-reveal
)
:n "za" 'org-cycle
:n "zA" 'org-shifttab
:n "zm" 'hide-body
:n "zr" 'show-all
:n "zo" 'show-subtree
:n "zO" 'show-all
:n "zc" 'hide-subtree
:n "zC" 'hide-all
(:localleader
:n "/" 'org-sparse-tree
:n "?" 'org-tags-view
:m "]]" (λ (call-interactively 'org-forward-heading-same-level) (org-beginning-of-line))
:m "[[" (λ (call-interactively 'org-backward-heading-same-level) (org-beginning-of-line))
:m "]l" 'org-next-link
:m "[l" 'org-previous-link
:n "n" (λ (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
:n "e" 'org-edit-special
:n "=" 'org-align-all-tags
:nv "l" 'org-insert-link
:n "L" 'org-store-link
:n "x" 'narf/org-remove-link
:n "w" 'writing-mode
:n "SPC" 'narf/org-toggle-checkbox
:n "RET" 'org-archive-subtree
:n "RET" 'narf/org-dwim-at-point
:n "a" 'org-agenda
:n "A" 'narf:org-attachment-list
:m "gh" 'outline-up-heading
:m "gj" 'org-forward-heading-same-level
:m "gk" 'org-backward-heading-same-level
:m "gl" (λ (call-interactively 'outline-next-visible-heading) (show-children))
:n "d" 'org-time-stamp
:n "D" 'org-time-stamp-inactive
:n "i" 'narf/org-toggle-inline-images-at-point
:n "t" (λ (org-todo (if (org-entry-is-todo-p) 'none 'todo)))
:n "T" 'org-todo
:n "r" 'org-refile
:n "s" 'org-schedule
)
:n "go" 'org-open-at-point
:n "gO" (λ (let ((org-link-frame-setup (append '((file . find-file-other-window)) org-link-frame-setup))
(org-file-apps '(("\\.org$" . emacs)
(t . "open \"%s\""))))
(call-interactively 'org-open-at-point)))
:n "za" 'org-cycle
:n "zA" 'org-shifttab
:n "zm" 'hide-body
:n "zr" 'show-all
:n "zo" 'show-subtree
:n "zO" 'show-all
:n "zc" 'hide-subtree
:n "zC" 'hide-all
:n "gQ" 'org-fill-paragraph
:m "$" 'org-end-of-line
:m "^" 'org-beginning-of-line
:n "<" 'org-metaleft
:n ">" 'org-metaright
:v "<" (λ (org-metaleft) (evil-visual-restore))
:v ">" (λ (org-metaright) (evil-visual-restore))
:n "-" 'org-cycle-list-bullet
:n [tab] 'org-cycle)
:m "]]" (λ (call-interactively 'org-forward-heading-same-level) (org-beginning-of-line))
:m "[[" (λ (call-interactively 'org-backward-heading-same-level) (org-beginning-of-line))
:m "]l" 'org-next-link
:m "[l" 'org-previous-link
(:map org-src-mode-map
:n "<escape>" (λ (message "Exited") (org-edit-src-exit)))
:n "RET" 'narf/org-dwim-at-point
(:after org-agenda
(:map org-agenda-mode-map
:e "<escape>" 'org-agenda-Quit
:e "C-j" 'org-agenda-next-item
:e "C-k" 'org-agenda-previous-item
:e "C-n" 'org-agenda-next-item
:e "C-p" 'org-agenda-previous-item)))
:m "gh" 'outline-up-heading
:m "gj" 'org-forward-heading-same-level
:m "gk" 'org-backward-heading-same-level
:m "gl" (λ (call-interactively 'outline-next-visible-heading) (show-children))
:n "go" 'org-open-at-point
:n "gO" (λ (let ((org-link-frame-setup (append '((file . find-file-other-window)) org-link-frame-setup))
(org-file-apps '(("\\.org$" . emacs)
(t . "open \"%s\""))))
(call-interactively 'org-open-at-point)))
:n "gQ" 'org-fill-paragraph
:m "$" 'org-end-of-line
:m "^" 'org-beginning-of-line
:n "<" 'org-metaleft
:n ">" 'org-metaright
:v "<" (λ (org-metaleft) (evil-visual-restore))
:v ">" (λ (org-metaright) (evil-visual-restore))
:n "-" 'org-cycle-list-bullet
:n [tab] 'org-cycle)
(:map org-src-mode-map
:n "<escape>" (λ (message "Exited") (org-edit-src-exit)))
(:after org-agenda
(:map org-agenda-mode-map
:e "<escape>" 'org-agenda-Quit
:e "C-j" 'org-agenda-next-item
:e "C-k" 'org-agenda-previous-item
:e "C-n" 'org-agenda-next-item
:e "C-p" 'org-agenda-previous-item)))
;;; OS-Specific
(cond (IS-MAC (narf-org-init-for-osx))

21
modules/module-python.el
View file

@ -22,14 +22,15 @@
:init
(associate! nose-mode :pattern "/test_.+\\.py\\'")
:config
(bind! :map nose-mode-map
:n ",tr" 'nosetests-again
:n ",ta" 'nosetests-all
:n ",ts" 'nosetests-one
:n ",tv" 'nosetests-module
:n ",tA" 'nosetests-pdb-all
:n ",tO" 'nosetests-pdb-one
:n ",tV" 'nosetests-pdb-module))
(map! :map nose-mode-map
(:localleader
:n "tr" 'nosetests-again
:n "ta" 'nosetests-all
:n "ts" 'nosetests-one
:n "tv" 'nosetests-module
:n "tA" 'nosetests-pdb-all
:n "tO" 'nosetests-pdb-one
:n "tV" 'nosetests-pdb-module)))
(use-package anaconda-mode
:diminish anaconda-mode
@ -39,8 +40,8 @@
(add-hook! python-mode '(anaconda-mode eldoc-mode))
(setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/"))
:config
(bind! :map anaconda-mode-map :m "gd" 'anaconda-mode-goto-definitions)
(bind! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)
(map! :map anaconda-mode-map :m "gd" 'anaconda-mode-goto-definitions)
(map! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)
(advice-add 'anaconda-mode-doc-buffer :after 'narf*anaconda-mode-doc-buffer)

10
modules/module-regex.el
View file

@ -5,14 +5,14 @@
:config
(require 'pcre2el)
(setq reb-re-syntax 'pcre)
(bind! :map rxt-help-mode-map :n [escape] 'kill-buffer-and-window)
(map! :map rxt-help-mode-map :n [escape] 'kill-buffer-and-window)
(add-hook! reb-mode 'narf|reb-cleanup)
(evil-set-initial-state 'reb-mode 'insert)
(bind! :map reb-mode-map
:n "C-g" 'reb-quit
:n [escape] 'reb-quit
:n [backtab] 'reb-change-syntax))
(map! :map reb-mode-map
:n "C-g" 'reb-quit
:n [escape] 'reb-quit
:n [backtab] 'reb-change-syntax))
(provide 'module-regex)
;;; module-regex.el ends here

11
modules/module-ruby.el
View file

@ -49,11 +49,12 @@
;; Rake
(("task" "namespace") () "end")))
:config
(bind! (:map rspec-mode-map
:n ",tr" 'rspec-rerun
:n ",ta" 'rspec-verify-all
:n ",ts" 'rspec-verify-single
:n ",tv" 'rspec-verify)))
(map! :map rspec-mode-map
(:localleader
:n "tr" 'rspec-rerun
:n "ta" 'rspec-verify-all
:n "ts" 'rspec-verify-single
:n "tv" 'rspec-verify)))
(use-package inf-ruby
:commands (inf-ruby inf-ruby-console-auto)

4
modules/module-rust.el
View file

@ -14,7 +14,9 @@
:config
(setq racer-cmd "/usr/local/bin/racer"
racer-rust-src-path "~/Dropbox/lib/rust/src/")
(bind! :map rust-mode-map :m "gd" 'racer-find-definition)
(map! :map rust-mode-map :m "gd" 'racer-find-definition)
;; TODO Unit test keybinds
(add-hook! rust-mode '(racer-mode eldoc-mode flycheck-rust-setup))
(define-company-backend! rust-mode (racer))))

45
modules/module-web.el
View file

@ -14,14 +14,15 @@
(setq-default css-indent-offset 2)
(setq scss-compile-at-save nil)
:config
(bind! :map scss-mode-map
:n "M-r" 'narf/web-refresh-browser
:n ",;" 'helm-css-scss
:n ",:" 'helm-css-scss-multi)
(map! :map scss-mode-map
:n "M-r" 'narf/web-refresh-browser
(:leader
:n ";" 'helm-css-scss
:n ":" 'helm-css-scss-multi))
(after! web-beautify
(add-hook! scss-mode (setenv "jsbeautify_indent_size" "2"))
(bind! :map scss-mode-map :m "gQ" 'web-beautify-css))
(map! :map scss-mode-map :m "gQ" 'web-beautify-css))
(after! emr
(emr-declare-command 'narf/scss-toggle-inline-or-block
@ -36,7 +37,7 @@
:init
(after! css-mode
(add-hook! css-mode (setenv "jsbeautify_indent_size" "2"))
(bind! :map css-mode-map :m "gQ" 'web-beautify-css)))
(map! :map css-mode-map :m "gQ" 'web-beautify-css)))
(use-package jade-mode
:mode "\\.jade$"
@ -56,26 +57,26 @@
:config
(after! web-beautify
(add-hook! web-mode (setenv "jsbeautify_indent_size" "4"))
(bind! :map web-mode-map :m "gQ" 'web-beautify-html))
(map! :map web-mode-map :m "gQ" 'web-beautify-html))
(after! nlinum
;; Fix blank line numbers after unfolding
(advice-add 'web-mode-fold-or-unfold :after 'nlinum--flush))
(bind! :map web-mode-map
"M-/" 'web-mode-comment-or-uncomment
(map! :map web-mode-map
"M-/" 'web-mode-comment-or-uncomment
:n "za" 'web-mode-fold-or-unfold
:n ",t" 'web-mode-element-rename
:n "za" 'web-mode-fold-or-unfold
(:localleader :n "t" 'web-mode-element-rename)
:n "M-r" 'narf/web-refresh-browser
:n "M-r" 'narf/web-refresh-browser
:nv "]a" 'web-mode-attribute-next
:nv "[a" 'web-mode-attribute-previous
:nv "]t" 'web-mode-tag-next
:nv "[t" 'web-mode-tag-previous
:nv "]T" 'web-mode-element-child
:nv "[T" 'web-mode-element-parent))
:nv "]a" 'web-mode-attribute-next
:nv "[a" 'web-mode-attribute-previous
:nv "]t" 'web-mode-tag-next
:nv "[t" 'web-mode-tag-previous
:nv "]T" 'web-mode-element-child
:nv "[T" 'web-mode-element-parent))
(use-package emmet-mode
:defer t
@ -85,10 +86,10 @@
(defvar emmet-mode-keymap (make-sparse-keymap))
:config
(setq emmet-move-cursor-between-quotes t)
(bind! :map emmet-mode-keymap
:v "M-e" 'emmet-wrap-with-markup
:i "M-e" 'emmet-expand-yas
:i "M-E" 'emmet-expand-line))
(map! :map emmet-mode-keymap
:v "M-e" 'emmet-wrap-with-markup
:i "M-e" 'emmet-expand-yas
:i "M-E" 'emmet-expand-line))
(define-minor-mode jekyll-mode
"Jekyll development mode."