Update private bindings

This commit is contained in:
Henrik Lissner 2017-10-25 14:50:33 +02:00
parent 19ca683f86
commit 8b11a88aa2
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -20,64 +20,61 @@
(map! (map!
;; --- Global keybindings --------------------------- ;; --- Global keybindings ---------------------------
;; Make M-x available everywhere ;; Make M-x available everywhere
:nvime "M-x" #'execute-extended-command :gnvime "M-x" #'execute-extended-command
:nvime "A-x" #'execute-extended-command :gnvime "A-x" #'execute-extended-command
;; Emacs debug utilities ;; Emacs debug utilities
"M-;" #'eval-expression :gnvime "M-;" #'eval-expression
:nvime "M-;" #'eval-expression :gnvime "M-:" #'doom/open-scratch-buffer
"M-:" #'doom/open-scratch-buffer
:nvime "M-:" #'doom/open-scratch-buffer
;; Text-scaling ;; Text-scaling
"M-+" (λ! (text-scale-set 0)) "M-+" (λ! (text-scale-set 0))
"M-=" #'text-scale-increase "M-=" #'text-scale-increase
"M--" #'text-scale-decrease "M--" #'text-scale-decrease
;; Simple window navigation/manipulation ;; Simple window navigation/manipulation
"C-`" #'doom/popup-toggle "C-`" #'doom/popup-toggle
"C-~" #'doom/popup-raise "C-~" #'doom/popup-raise
"M-t" #'+workspace/new "M-t" #'+workspace/new
"M-T" #'+workspace/display "M-T" #'+workspace/display
"M-w" #'delete-window "M-w" #'delete-window
"M-W" #'+workspace/close-workspace-or-frame "M-W" #'+workspace/close-workspace-or-frame
"M-n" #'evil-buffer-new "M-n" #'evil-buffer-new
"M-N" #'make-frame "M-N" #'make-frame
"M-1" (λ! (+workspace/switch-to 0)) "M-1" (λ! (+workspace/switch-to 0))
"M-2" (λ! (+workspace/switch-to 1)) "M-2" (λ! (+workspace/switch-to 1))
"M-3" (λ! (+workspace/switch-to 2)) "M-3" (λ! (+workspace/switch-to 2))
"M-4" (λ! (+workspace/switch-to 3)) "M-4" (λ! (+workspace/switch-to 3))
"M-5" (λ! (+workspace/switch-to 4)) "M-5" (λ! (+workspace/switch-to 4))
"M-6" (λ! (+workspace/switch-to 5)) "M-6" (λ! (+workspace/switch-to 5))
"M-7" (λ! (+workspace/switch-to 6)) "M-7" (λ! (+workspace/switch-to 6))
"M-8" (λ! (+workspace/switch-to 7)) "M-8" (λ! (+workspace/switch-to 7))
"M-9" (λ! (+workspace/switch-to 8)) "M-9" (λ! (+workspace/switch-to 8))
"M-0" #'+workspace/switch-to-last "M-0" #'+workspace/switch-to-last
;; Other sensible, textmate-esque global bindings ;; Other sensible, textmate-esque global bindings
"M-r" #'+eval/buffer :ne "M-r" #'+eval/buffer
"M-R" #'+eval/region-and-replace :ne "M-R" #'+eval/region-and-replace
"M-b" #'+eval/build :ne "M-b" #'+eval/build
"M-a" #'mark-whole-buffer :ne "M-a" #'mark-whole-buffer
"M-c" #'evil-yank :ne "M-c" #'evil-yank
"M-q" (if (daemonp) #'delete-frame #'save-buffers-kill-emacs) :ne "M-q" (if (daemonp) #'delete-frame #'save-buffers-kill-emacs)
"M-s" #'save-buffer :ne "M-f" #'swiper
"M-v" #'clipboard-yank :ne "C-M-f" #'doom/toggle-fullscreen
"M-f" #'swiper :n "M-s" #'save-buffer
"C-M-f" #'doom/toggle-fullscreen :m "A-j" #'+hlissner:multi-next-line
:m "A-j" #'+hlissner:multi-next-line :m "A-k" #'+hlissner:multi-previous-line
:m "A-k" #'+hlissner:multi-previous-line
:nv "C-SPC" #'+evil:fold-toggle :nv "C-SPC" #'+evil:fold-toggle
:gnvimer "M-v" #'clipboard-yank
;; Easier window navigation ;; Easier window navigation
:en "C-h" #'evil-window-left :en "C-h" #'evil-window-left
:en "C-j" #'evil-window-down :en "C-j" #'evil-window-down
:en "C-k" #'evil-window-up :en "C-k" #'evil-window-up
:en "C-l" #'evil-window-right :en "C-l" #'evil-window-right
(:prefix "C-x" "C-x p" #'doom/other-popup
"p" #'doom/other-popup)
;; --- <leader> ------------------------------------- ;; --- <leader> -------------------------------------
(:leader (:leader
:desc "Ex command" :nv ";" #'evil-ex :desc "Ex command" :nv ";" #'evil-ex
:desc "M-x" :nv ":" #'execute-extended-command :desc "M-x" :nv ":" #'execute-extended-command
:desc "Pop up scratch buffer" :nv "x" #'doom/open-scratch-buffer :desc "Pop up scratch buffer" :nv "x" #'doom/open-scratch-buffer
:desc "Org Capture" :nv "X" #'+org-capture/open :desc "Org Capture" :nv "X" #'+org-capture/open
@ -92,30 +89,30 @@
:desc "Jump to bookmark" :n "RET" #'bookmark-jump :desc "Jump to bookmark" :n "RET" #'bookmark-jump
;; C-u is used by evil ;; C-u is used by evil
:desc "Universal argument" :n "u" #'universal-argument :desc "Universal argument" :n "u" #'universal-argument
:desc "window" :n "w" evil-window-map :desc "window" :n "w" evil-window-map
(:desc "previous..." :prefix "[" (:desc "previous..." :prefix "["
:desc "Text size" :nv "[" #'text-scale-decrease :desc "Text size" :nv "[" #'text-scale-decrease
:desc "Buffer" :nv "b" #'doom/previous-buffer :desc "Buffer" :nv "b" #'doom/previous-buffer
:desc "Diff Hunk" :nv "d" #'git-gutter:previous-hunk :desc "Diff Hunk" :nv "d" #'git-gutter:previous-hunk
:desc "Todo" :nv "t" #'hl-todo-previous :desc "Todo" :nv "t" #'hl-todo-previous
:desc "Error" :nv "e" #'previous-error :desc "Error" :nv "e" #'previous-error
:desc "Workspace" :nv "w" #'+workspace/switch-left :desc "Workspace" :nv "w" #'+workspace/switch-left
:desc "Smart jump" :nv "h" #'smart-backward :desc "Smart jump" :nv "h" #'smart-backward
:desc "Spelling error" :nv "s" #'evil-prev-flyspell-error :desc "Spelling error" :nv "s" #'evil-prev-flyspell-error
:desc "Spelling correction" :n "S" #'flyspell-correct-previous-word-generic) :desc "Spelling correction" :n "S" #'flyspell-correct-previous-word-generic)
(:desc "next..." :prefix "]" (:desc "next..." :prefix "]"
:desc "Text size" :nv "]" #'text-scale-increase :desc "Text size" :nv "]" #'text-scale-increase
:desc "Buffer" :nv "b" #'doom/next-buffer :desc "Buffer" :nv "b" #'doom/next-buffer
:desc "Diff Hunk" :nv "d" #'git-gutter:next-hunk :desc "Diff Hunk" :nv "d" #'git-gutter:next-hunk
:desc "Todo" :nv "t" #'hl-todo-next :desc "Todo" :nv "t" #'hl-todo-next
:desc "Error" :nv "e" #'next-error :desc "Error" :nv "e" #'next-error
:desc "Workspace" :nv "w" #'+workspace/switch-right :desc "Workspace" :nv "w" #'+workspace/switch-right
:desc "Smart jump" :nv "l" #'smart-forward :desc "Smart jump" :nv "l" #'smart-forward
:desc "Spelling error" :nv "s" #'evil-next-flyspell-error :desc "Spelling error" :nv "s" #'evil-next-flyspell-error
:desc "Spelling correction" :n "S" #'flyspell-correct-word-generic) :desc "Spelling correction" :n "S" #'flyspell-correct-word-generic)
(:desc "search" :prefix "/" (:desc "search" :prefix "/"
:desc "Swiper" :nv "/" #'swiper :desc "Swiper" :nv "/" #'swiper
@ -188,64 +185,64 @@
:desc "Yank filename" :n "y" #'+hlissner/yank-buffer-filename) :desc "Yank filename" :n "y" #'+hlissner/yank-buffer-filename)
(:desc "git" :prefix "g" (:desc "git" :prefix "g"
:desc "Git status" :n "S" #'magit-status :desc "Git status" :n "S" #'magit-status
:desc "Git blame" :n "b" #'magit-blame :desc "Git blame" :n "b" #'magit-blame
:desc "Git time machine" :n "t" #'git-timemachine-toggle :desc "Git time machine" :n "t" #'git-timemachine-toggle
:desc "Git stage hunk" :n "s" #'git-gutter:stage-hunk :desc "Git stage hunk" :n "s" #'git-gutter:stage-hunk
:desc "Git revert hunk" :n "r" #'git-gutter:revert-hunk :desc "Git revert hunk" :n "r" #'git-gutter:revert-hunk
:desc "Git revert buffer" :n "R" #'vc-revert :desc "Git revert buffer" :n "R" #'vc-revert
:desc "List gists" :n "g" #'+gist:list :desc "List gists" :n "g" #'+gist:list
:desc "Next hunk" :nv "]" #'git-gutter:next-hunk :desc "Next hunk" :nv "]" #'git-gutter:next-hunk
:desc "Previous hunk" :nv "[" #'git-gutter:previous-hunk) :desc "Previous hunk" :nv "[" #'git-gutter:previous-hunk)
(:desc "help" :prefix "h" (:desc "help" :prefix "h"
:n "h" help-map :n "h" help-map
:desc "Apropos" :n "a" #'apropos :desc "Apropos" :n "a" #'apropos
:desc "Reload theme" :n "R" #'doom/reload-theme :desc "Reload theme" :n "R" #'doom/reload-theme
:desc "Find library" :n "l" #'find-library :desc "Find library" :n "l" #'find-library
:desc "Toggle Emacs log" :n "m" #'doom/popup-toggle-messages :desc "Toggle Emacs log" :n "m" #'doom/popup-toggle-messages
:desc "Command log" :n "L" #'global-command-log-mode :desc "Command log" :n "L" #'global-command-log-mode
:desc "Describe function" :n "f" #'describe-function :desc "Describe function" :n "f" #'describe-function
:desc "Describe key" :n "k" #'describe-key :desc "Describe key" :n "k" #'describe-key
:desc "Describe char" :n "c" #'describe-char :desc "Describe char" :n "c" #'describe-char
:desc "Describe mode" :n "M" #'describe-mode :desc "Describe mode" :n "M" #'describe-mode
:desc "Describe variable" :n "v" #'describe-variable :desc "Describe variable" :n "v" #'describe-variable
:desc "Describe face" :n "F" #'describe-face :desc "Describe face" :n "F" #'describe-face
:desc "Describe DOOM setting" :n "s" #'doom/describe-setting :desc "Describe DOOM setting" :n "s" #'doom/describe-setting
:desc "Describe DOOM module" :n "d" #'doom/describe-module :desc "Describe DOOM module" :n "d" #'doom/describe-module
:desc "Find definition" :n "." #'+jump/definition :desc "Find definition" :n "." #'+jump/definition
:desc "Find references" :n "/" #'+jump/references :desc "Find references" :n "/" #'+jump/references
:desc "Find documentation" :n "h" #'+jump/documentation :desc "Find documentation" :n "h" #'+jump/documentation
:desc "What face" :n "'" #'doom/what-face :desc "What face" :n "'" #'doom/what-face
:desc "What minor modes" :n ";" #'doom/what-minor-mode :desc "What minor modes" :n ";" #'doom/what-minor-mode
:desc "Info" :n "i" #'info :desc "Info" :n "i" #'info
:desc "Toggle profiler" :n "p" #'doom/toggle-profiler) :desc "Toggle profiler" :n "p" #'doom/toggle-profiler)
(:desc "insert" :prefix "i" (:desc "insert" :prefix "i"
:desc "From kill-ring" :nv "y" #'counsel-yank-pop :desc "From kill-ring" :nv "y" #'counsel-yank-pop
:desc "From snippet" :nv "s" #'yas-insert-snippet) :desc "From snippet" :nv "s" #'yas-insert-snippet)
(:desc "notes" :prefix "n" (:desc "notes" :prefix "n"
:desc "Find file in notes" :n "n" #'+hlissner/find-in-notes :desc "Find file in notes" :n "n" #'+hlissner/find-in-notes
:desc "Browse notes" :n "N" #'+hlissner/browse-notes :desc "Browse notes" :n "N" #'+hlissner/browse-notes
:desc "Org capture" :n "x" #'+org-capture/open :desc "Org capture" :n "x" #'+org-capture/open
:desc "Browse mode notes" :n "m" #'+org/browse-notes-for-major-mode :desc "Browse mode notes" :n "m" #'+org/browse-notes-for-major-mode
:desc "Browse project notes" :n "p" #'+org/browse-notes-for-project) :desc "Browse project notes" :n "p" #'+org/browse-notes-for-project)
(:desc "open" :prefix "o" (:desc "open" :prefix "o"
:desc "Default browser" :n "b" #'browse-url-of-file :desc "Default browser" :n "b" #'browse-url-of-file
:desc "Debugger" :n "d" #'+debug/open :desc "Debugger" :n "d" #'+debug/open
:desc "REPL" :n "r" #'+eval/open-repl :desc "REPL" :n "r" #'+eval/open-repl
:v "r" #'+eval:repl :v "r" #'+eval:repl
:desc "Neotree" :n "n" #'+neotree/toggle :desc "Neotree" :n "n" #'+neotree/toggle
:desc "Terminal" :n "t" #'+term/open-popup :desc "Terminal" :n "t" #'+term/open-popup
:desc "Terminal in project" :n "T" #'+term/open-popup-in-project :desc "Terminal in project" :n "T" #'+term/open-popup-in-project
;; applications ;; applications
:desc "APP: elfeed" :n "E" #'=rss :desc "APP: elfeed" :n "E" #'=rss
:desc "APP: email" :n "M" #'=email :desc "APP: email" :n "M" #'=email
:desc "APP: twitter" :n "T" #'=twitter :desc "APP: twitter" :n "T" #'=twitter
:desc "APP: regex" :n "X" #'=regex :desc "APP: regex" :n "X" #'=regex
;; macos ;; macos
(:when IS-MAC (:when IS-MAC
@ -267,8 +264,8 @@
:desc "Invalidate cache" :n "x" #'projectile-invalidate-cache) :desc "Invalidate cache" :n "x" #'projectile-invalidate-cache)
(:desc "quit" :prefix "q" (:desc "quit" :prefix "q"
:desc "Quit" :n "q" #'evil-save-and-quit :desc "Quit" :n "q" #'evil-save-and-quit
:desc "Quit (forget session)" :n "Q" #'+workspace/kill-session-and-quit) :desc "Quit (forget session)" :n "Q" #'+workspace/kill-session-and-quit)
(:desc "remote" :prefix "r" (:desc "remote" :prefix "r"
:desc "Upload local" :n "u" #'+upload/local :desc "Upload local" :n "u" #'+upload/local
@ -279,10 +276,10 @@
:desc "Detect remote changes" :n ">" #'+upload/check-remote) :desc "Detect remote changes" :n ">" #'+upload/check-remote)
(:desc "snippets" :prefix "s" (:desc "snippets" :prefix "s"
:desc "New snippet" :n "n" #'yas-new-snippet :desc "New snippet" :n "n" #'yas-new-snippet
:desc "Insert snippet" :nv "i" #'yas-insert-snippet :desc "Insert snippet" :nv "i" #'yas-insert-snippet
:desc "Find snippet for mode" :n "s" #'yas-visit-snippet-file :desc "Find snippet for mode" :n "s" #'yas-visit-snippet-file
:desc "Find snippet" :n "S" #'+hlissner/find-in-snippets) :desc "Find snippet" :n "S" #'+hlissner/find-in-snippets)
(:desc "toggle" :prefix "t" (:desc "toggle" :prefix "t"
:desc "Flyspell" :n "s" #'flyspell-mode :desc "Flyspell" :n "s" #'flyspell-mode
@ -484,13 +481,12 @@
;; git-timemachine ;; git-timemachine
(:after git-timemachine (:after git-timemachine
(:map git-timemachine-mode-map (:map git-timemachine-mode-map
:nv "p" #'git-timemachine-show-previous-revision :n "C-p" #'git-timemachine-show-previous-revision
:nv "n" #'git-timemachine-show-next-revision :n "C-n" #'git-timemachine-show-next-revision
:nv "g" #'git-timemachine-show-nth-revision :n "[[" #'git-timemachine-show-previous-revision
:nv "q" #'git-timemachine-quit :n "]]" #'git-timemachine-show-next-revision
:nv "w" #'git-timemachine-kill-abbreviated-revision :n "q" #'git-timemachine-quit
:nv "W" #'git-timemachine-kill-revision :n "gb" #'git-timemachine-blame))
:nv "b" #'git-timemachine-blame))
;; gist ;; gist
(:after gist (:after gist