Normalize :leader/:localleader keybinds

Evil states no longer apply to them. Also removes x-alt-keysym.
This commit is contained in:
Henrik Lissner 2018-12-23 23:54:27 -05:00
parent 9936532ea3
commit 3f195614d9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
34 changed files with 626 additions and 618 deletions

View file

@ -65,15 +65,14 @@
(IS-LINUX (IS-LINUX
(setq x-gtk-use-system-tooltips nil ; native tooltips are ugly! (setq x-gtk-use-system-tooltips nil ; native tooltips are ugly!
x-underline-at-descent-line t ; draw underline lower x-underline-at-descent-line t)) ; draw underline lower
x-alt-keysym 'meta))
(IS-WINDOWS (IS-WINDOWS
(setq w32-get-true-file-attributes nil ; fix file io slowdowns (setq w32-get-true-file-attributes nil ; fix file io slowdowns
;; map window keys to super ;; map window keys to super (unreliable)
w32-pass-lwindow-to-system nil w32-pass-lwindow-to-system nil
w32-lwindow-modifier 'super
w32-pass-rwindow-to-system nil w32-pass-rwindow-to-system nil
w32-lwindow-modifier 'super
w32-rwindow-modifier 'super) w32-rwindow-modifier 'super)
(when (display-graphic-p) (when (display-graphic-p)
(setenv "GIT_ASKPASS" "git-gui--askpass")))) (setenv "GIT_ASKPASS" "git-gui--askpass"))))

View file

@ -13,7 +13,7 @@
:config :config
(map! :map parinfer-mode-map (map! :map parinfer-mode-map
"\"" nil ; smartparens handles this "\"" nil ; smartparens handles this
:i "<tab>" #'parinfer-smart-tab:dwim-right-or-complete :i "<tab>" #'parinfer-smart-tab:dwim-right-or-complete
:i "<backtab>" #'parinfer-smart-tab:dwim-left :i "<backtab>" #'parinfer-smart-tab:dwim-left
:localleader :localleader
:nv "m" #'parinfer-toggle-mode)) :desc "Toggle parinfer-mode" "m" #'parinfer-toggle-mode))

View file

@ -13,26 +13,27 @@
:config :config
(map! :map agda2-mode-map (map! :map agda2-mode-map
:localleader :localleader
:n "?" #'agda2-show-goals "?" #'agda2-show-goals
:n "." #'agda2-goal-and-context-and-inferred "." #'agda2-goal-and-context-and-inferred
:n "," #'agda2-goal-and-context "," #'agda2-goal-and-context
:n "=" #'agda2-show-constraints "=" #'agda2-show-constraints
:n "SPC" #'agda2-give "SPC" #'agda2-give
:n "a" #'agda2-auto "a" #'agda2-auto
:n "c" #'agda2-make-case "c" #'agda2-make-case
:n "d" #'agda2-infer-type-maybe-toplevel "d" #'agda2-infer-type-maybe-toplevel
:n "e" #'agda2-show-context "e" #'agda2-show-context
:n "gG" #'agda2-go-back "gG" #'agda2-go-back
:n "h" #'agda2-helper-function-type "h" #'agda2-helper-function-type
:n "l" #'agda2-load "l" #'agda2-load
:n "n" #'agda2-compute-normalised-maybe-toplevel "n" #'agda2-compute-normalised-maybe-toplevel
:n "p" #'agda2-module-contents-maybe-toplevel "p" #'agda2-module-contents-maybe-toplevel
:n "r" #'agda2-refine "r" #'agda2-refine
:n "s" #'agda2-solveAll "s" #'agda2-solveAll
:n "t" #'agda2-goal-type "t" #'agda2-goal-type
:n "w" #'agda2-why-in-scope-maybe-toplevel "w" #'agda2-why-in-scope-maybe-toplevel
:n "xc" #'agda2-compile (:prefix "x"
:n "xd" #'agda2-remove-annotations "c" #'agda2-compile
:n "xh" #'agda2-display-implicit-arguments "d" #'agda2-remove-annotations
:n "xq" #'agda2-quit "h" #'agda2-display-implicit-arguments
:n "xr" #'agda2-restart)) "q" #'agda2-quit
"r" #'agda2-restart)))

View file

@ -44,64 +44,63 @@
cider-stacktrace-default-filters '(tooling dup)) cider-stacktrace-default-filters '(tooling dup))
;; TODO: Add mode-local labels when general support is in. ;; TODO: Add mode-local labels when general support is in.
(map! :localleader (map! (:localleader
(:map clojure-mode-map (:map clojure-mode-map
:n "'" #'cider-jack-in "'" #'cider-jack-in
:n "\"" #'cider-jack-in-clojurescript) "\"" #'cider-jack-in-clojurescript)
(:map cider-mode-map (:map cider-mode-map
;; eval ;; eval
(:prefix "e" (:prefix "e"
:n "d" #'cider-eval-defun-at-point "d" #'cider-eval-defun-at-point
:n "D" #'cider-insert-defun-in-repl "D" #'cider-insert-defun-in-repl
:n "e" #'cider-eval-last-sexp "e" #'cider-eval-last-sexp
:n "E" #'cider-insert-last-sexp-in-repl "E" #'cider-insert-last-sexp-in-repl
:n "r" #'cider-eval-region "r" #'cider-eval-region
:n "R" #'cider-insert-region-in-repl "R" #'cider-insert-region-in-repl
:n "u" #'cider-undef) "u" #'cider-undef)
;; go/jump ;; go/jump
(:prefix "g" (:prefix "g"
:n "b" #'cider-pop-back "b" #'cider-pop-back
:n "g" #'cider-find-var "g" #'cider-find-var
:n "n" #'cider-find-ns) "n" #'cider-find-ns)
;; help ;; help
(:prefix "h" (:prefix "h"
:n "n" #'cider-find-ns "n" #'cider-find-ns
:n "a" #'cider-apropos "a" #'cider-apropos
:n "d" #'cider-doc "d" #'cider-doc
:n "g" #'cider-grimoire-web "g" #'cider-grimoire-web
:n "j" #'cider-javadoc) "j" #'cider-javadoc)
;; inspect ;; inspect
(:prefix "i" (:prefix "i"
:n "i" #'cider-inspect "i" #'cider-inspect
:n "r" #'cider-inspect-last-result) "r" #'cider-inspect-last-result)
;; macro ;; macro
(:prefix "m" (:prefix "m"
:n "e" #'cider-macroexpand-1 "e" #'cider-macroexpand-1
:n "E" #'cider-macroexpand-al) "E" #'cider-macroexpand-al)
;; namespace ;; namespace
(:prefix "n" (:prefix "n"
:n "n" #'cider-browse-ns "n" #'cider-browse-ns
:n "N" #'cider-browse-ns-all) "N" #'cider-browse-ns-all)
;; repl ;; repl
(:prefix "r" (:prefix "r"
:n "n" #'cider-repl-set-ns "n" #'cider-repl-set-ns
:n "q" #'cider-quit "q" #'cider-quit
:n "r" #'cider-refresh "r" #'cider-refresh
:n "R" #'cider-restart "R" #'cider-restart
:n "b" #'cider-switch-to-repl-buffer "b" #'cider-switch-to-repl-buffer
:n "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns
:n "c" #'cider-repl-clear-buffer))) "c" #'cider-repl-clear-buffer)))
(when (featurep! :feature evil +everywhere) (:when (featurep! :feature evil +everywhere)
(evil-define-key 'insert cider-repl-mode-map :map cider-repl-mode-map :i [S-return] #'cider-repl-newline-and-indent
[S-return] #'cider-repl-newline-and-indent) :map cider-repl-history-mode-map
(evil-define-key 'normal cider-repl-history-mode-map :i [return] #'cider-repl-history-insert-and-quit
"q" 'cider-repl-history-quit :i "q" #'cider-repl-history-quit
[return] 'cider-repl-history-insert-and-quit :i "l" #'cider-repl-history-occur
"l" 'cider-repl-history-occur :i "s" #'cider-repl-history-search-forward
"s" 'cider-repl-history-search-forward :i "r" #'cider-repl-history-search-backward
"r" 'cider-repl-history-search-backward :i "U" #'cider-repl-history-undo-other-window)))
"U" 'cider-repl-history-undo-other-window)))
(def-package! clj-refactor (def-package! clj-refactor
:hook (clojure-mode . clj-refactor-mode) :hook (clojure-mode . clj-refactor-mode)

View file

@ -76,65 +76,65 @@ bin/doom while packages at compile-time (not a runtime though)."
(advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version)) (advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version))
(advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version) (advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version)
(map! :map sly-mode-map (map! :localleader
:localleader :map sly-mode-map
:n "'" #'sly "'" #'sly
(:prefix "g" (:prefix "g"
:n "b" #'sly-pop-find-definition-stack "b" #'sly-pop-find-definition-stack
:n "d" #'sly-edit-definition "d" #'sly-edit-definition
:n "D" #'sly-edit-definition-other-window "D" #'sly-edit-definition-other-window
:n "n" #'sly-next-note "n" #'sly-next-note
:n "N" #'sly-previous-note "N" #'sly-previous-note
:n "s" #'sly-stickers-next-sticker "s" #'sly-stickers-next-sticker
:n "S" #'sly-stickers-prev-sticker) "S" #'sly-stickers-prev-sticker)
(:prefix "h" (:prefix "h"
:n "<" #'sly-who-calls "<" #'sly-who-calls
:n ">" #'sly-calls-who ">" #'sly-calls-who
:n "~" #'hyperspec-lookup-format "~" #'hyperspec-lookup-format
:n "#" #'hyperspec-lookup-reader-macro "#" #'hyperspec-lookup-reader-macro
:n "a" #'sly-apropos "a" #'sly-apropos
:n "b" #'sly-who-binds "b" #'sly-who-binds
:n "d" #'sly-disassemble-symbol "d" #'sly-disassemble-symbol
:n "h" #'sly-describe-symbol "h" #'sly-describe-symbol
:n "H" #'sly-hyperspec-lookup "H" #'sly-hyperspec-lookup
:n "m" #'sly-who-macroexpands "m" #'sly-who-macroexpands
:n "p" #'sly-apropos-package "p" #'sly-apropos-package
:n "r" #'sly-who-references "r" #'sly-who-references
:n "s" #'sly-who-specializes "s" #'sly-who-specializes
:n "S" #'sly-who-sets) "S" #'sly-who-sets)
(:prefix "c" (:prefix "c"
:n "c" #'sly-compile-file "c" #'sly-compile-file
:n "C" #'sly-compile-and-load-file "C" #'sly-compile-and-load-file
:n "f" #'sly-compile-defun "f" #'sly-compile-defun
:n "l" #'sly-load-file "l" #'sly-load-file
:n "n" #'sly-remove-notes "n" #'sly-remove-notes
:v "r" #'sly-compile-region) "r" #'sly-compile-region)
(:prefix "e" (:prefix "e"
:n "b" #'sly-eval-buffer "b" #'sly-eval-buffer
:n "e" #'sly-eval-last-expression "e" #'sly-eval-last-expression
:n "E" #'sly-eval-print-last-expression "E" #'sly-eval-print-last-expression
:n "f" #'sly-eval-defun "f" #'sly-eval-defun
:n "F" #'sly-undefine-function "F" #'sly-undefine-function
:v "r" #'sly-eval-region) "r" #'sly-eval-region)
(:prefix "m" (:prefix "m"
:n "e" #'+common-lisp/macrostep/body "e" #'+common-lisp/macrostep/body
:n "E" #'macrostep-expand) "E" #'macrostep-expand)
(:prefix "r" (:prefix "r"
:n "c" #'sly-mrepl-clear-repl "c" #'sly-mrepl-clear-repl
:n "q" #'sly-quit-lisp "q" #'sly-quit-lisp
:n "r" #'sly-restart-inferior-lisp "r" #'sly-restart-inferior-lisp
:n "s" #'sly-mrepl-sync) "s" #'sly-mrepl-sync)
(:prefix "s" (:prefix "s"
:n "b" #'sly-stickers-toggle-break-on-stickers "b" #'sly-stickers-toggle-break-on-stickers
:n "c" #'sly-stickers-clear-defun-stickers "c" #'sly-stickers-clear-defun-stickers
:n "C" #'sly-stickers-clear-buffer-stickers "C" #'sly-stickers-clear-buffer-stickers
:n "f" #'sly-stickers-fetch "f" #'sly-stickers-fetch
:n "r" #'sly-stickers-replay "r" #'sly-stickers-replay
:n "s" #'sly-stickers-dwim) "s" #'sly-stickers-dwim)
(:prefix "t" (:prefix "t"
:n "t" #'sly-toggle-trace-fdefinition "t" #'sly-toggle-trace-fdefinition
:n "T" #'sly-toggle-fancy-trace "T" #'sly-toggle-fancy-trace
:n "u" #'sly-untrace-all)) "u" #'sly-untrace-all))
(when (featurep! :feature evil +everywhere) (when (featurep! :feature evil +everywhere)
(add-hook 'sly-mode-hook #'evil-normalize-keymaps) (add-hook 'sly-mode-hook #'evil-normalize-keymaps)

View file

@ -25,30 +25,29 @@
:references #'omnisharp-find-usages :references #'omnisharp-find-usages
:documentation #'omnisharp-current-type-documentation) :documentation #'omnisharp-current-type-documentation)
(map! :map omnisharp-mode-map (map! :localleader
:localleader :map omnisharp-mode-map
:n "b" #'omnisharp-recompile "b" #'omnisharp-recompile
(:prefix "r" (:prefix "r"
:n "i" #'omnisharp-fix-code-issue-at-point "i" #'omnisharp-fix-code-issue-at-point
:n "u" #'omnisharp-fix-usings "u" #'omnisharp-fix-usings
:n "r" #'omnisharp-rename "r" #'omnisharp-rename
:n "a" #'omnisharp-show-last-auto-complete-result "a" #'omnisharp-show-last-auto-complete-result
:n "o" #'omnisharp-show-overloads-at-point) "o" #'omnisharp-show-overloads-at-point)
(:prefix "f" (:prefix "f"
:n "u" #'omnisharp-find-usages "u" #'omnisharp-find-usages
:n "i" #'omnisharp-find-implementations "i" #'omnisharp-find-implementations
:n "f" #'omnisharp-navigate-to-current-file-member "f" #'omnisharp-navigate-to-current-file-member
:n "m" #'omnisharp-navigate-to-solution-member "m" #'omnisharp-navigate-to-solution-member
:n "M" #'omnisharp-navigate-to-solution-file-then-file-member "M" #'omnisharp-navigate-to-solution-file-then-file-member
:n "F" #'omnisharp-navigate-to-solution-file "F" #'omnisharp-navigate-to-solution-file
:n "r" #'omnisharp-navigate-to-region "r" #'omnisharp-navigate-to-region
:n "ti" #'omnisharp-current-type-information "ti" #'omnisharp-current-type-information
:n "td" #'omnisharp-current-type-documentation) "td" #'omnisharp-current-type-documentation)
(:prefix "t" (:prefix "t"
:n "r" (λ! (omnisharp-unit-test "fixture")) "r" (λ! (omnisharp-unit-test "fixture"))
:n "s" (λ! (omnisharp-unit-test "single")) "s" (λ! (omnisharp-unit-test "single"))
:n "a" (λ! (omnisharp-unit-test "all"))))) "a" (λ! (omnisharp-unit-test "all")))))

View file

@ -14,14 +14,14 @@
;; `csv-mode' ;; `csv-mode'
(map! :after csv-mode (map! :after csv-mode
:map csv-mode-map
:localleader :localleader
:nvm "a" #'csv-align-fields :map csv-mode-map
:nvm "u" #'csv-unalign-fields "a" #'csv-align-fields
:nvm "s" #'csv-sort-fields "u" #'csv-unalign-fields
:nvm "S" #'csv-sort-numeric-fields "s" #'csv-sort-fields
:nvm "k" #'csv-kill-fields "S" #'csv-sort-numeric-fields
:nvm "t" #'csv-transpose) "k" #'csv-kill-fields
"t" #'csv-transpose)
(def-package! graphql-mode (def-package! graphql-mode
:mode "\\.gql\\'") :mode "\\.gql\\'")

View file

@ -81,21 +81,21 @@
(when (featurep! :feature evil) (when (featurep! :feature evil)
(after! macrostep (after! macrostep
(evil-define-key* 'normal macrostep-keymap (evil-define-key* 'normal macrostep-keymap
(kbd "RET") #'macrostep-expand [return] #'macrostep-expand
"e" #'macrostep-expand "e" #'macrostep-expand
"u" #'macrostep-collapse "u" #'macrostep-collapse
"c" #'macrostep-collapse "c" #'macrostep-collapse
[tab] #'macrostep-next-macro [tab] #'macrostep-next-macro
"\C-n" #'macrostep-next-macro "\C-n" #'macrostep-next-macro
"J" #'macrostep-next-macro "J" #'macrostep-next-macro
[backtab] #'macrostep-prev-macro [backtab] #'macrostep-prev-macro
"K" #'macrostep-prev-macro "K" #'macrostep-prev-macro
"\C-p" #'macrostep-prev-macro "\C-p" #'macrostep-prev-macro
"q" #'macrostep-collapse-all "q" #'macrostep-collapse-all
"C" #'macrostep-collapse-all) "C" #'macrostep-collapse-all)
;; `evil-normalize-keymaps' seems to be required for macrostep or it won't ;; `evil-normalize-keymaps' seems to be required for macrostep or it won't
;; apply for the very first invocation ;; apply for the very first invocation

View file

@ -17,41 +17,42 @@
(set-repl-handler! 'ess-mode #'+ess/r-repl) (set-repl-handler! 'ess-mode #'+ess/r-repl)
(set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object) (set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object)
(after! ess-help (map! (:after ess-help
(define-key! ess-doc-map :map ess-doc-map
"h" #'ess-display-help-on-object "h" #'ess-display-help-on-object
"p" #'ess-R-dv-pprint "p" #'ess-R-dv-pprint
"t" #'ess-R-dv-ctable) "t" #'ess-R-dv-ctable
(define-key! ess-doc-map [C-return] #'ess-eval-line
[s-return] #'ess-eval-line [up] #'comint-next-input
[up] #'comint-next-input [down] #'comint-previous-input)
[down] #'comint-previous-input))
(map! :map ess-mode-map
:localleader :localleader
:nv "," #'ess-eval-region-or-function-or-paragraph-and-step :map ess-mode-map
:n "'" #'R "," #'ess-eval-region-or-function-or-paragraph-and-step
:n "<tab>" #'ess-switch-to-inferior-or-script-buffer "'" #'R
:n "<backtab>" #'ess-switch-process [tab] #'ess-switch-to-inferior-or-script-buffer
:n ;; REPL [backtab] #'ess-switch-process
:n "B" #'ess-eval-buffer-and-go ;; REPL
:n "b" #'ess-eval-buffer "B" #'ess-eval-buffer-and-go
:nv "d" #'ess-eval-region-or-line-and-step "b" #'ess-eval-buffer
:n "D" #'ess-eval-function-or-paragraph-and-step "d" #'ess-eval-region-or-line-and-step
:n "L" #'ess-eval-line-and-go "D" #'ess-eval-function-or-paragraph-and-step
:n "l" #'ess-eval-line "L" #'ess-eval-line-and-go
:nv "R" #'ess-eval-region-and-go "l" #'ess-eval-line
:nv "r" #'ess-eval-region "R" #'ess-eval-region-and-go
:n "F" #'ess-eval-function-and-go "r" #'ess-eval-region
:n "f" #'ess-eval-function "F" #'ess-eval-function-and-go
"f" #'ess-eval-function
;; predefined keymaps ;; predefined keymaps
:n "h" #'ess-doc-map "h" #'ess-doc-map
:n "x" #'ess-extra-map "x" #'ess-extra-map
:n "p" #'ess-r-package-dev-map "p" #'ess-r-package-dev-map
:n "v" #'ess-dev-map "v" #'ess-dev-map
;; noweb ;; noweb
:n "cC" #'ess-eval-chunk-and-go :prefix "c"
:n "cc" #'ess-eval-chunk "C" #'ess-eval-chunk-and-go
:n "cd" #'ess-eval-chunk-and-step "c" #'ess-eval-chunk
:n "cm" #'ess-noweb-mark-chunk "d" #'ess-eval-chunk-and-step
:n "cp" #'ess-noweb-previous-chunk "m" #'ess-noweb-mark-chunk
:n "cn" #'ess-noweb-next-chunk)) "p" #'ess-noweb-previous-chunk
"n" #'ess-noweb-next-chunk))

View file

@ -37,3 +37,10 @@
(+go--run-tests (concat "-run" "='" (match-string-no-properties 2) "'"))) (+go--run-tests (concat "-run" "='" (match-string-no-properties 2) "'")))
(error "Must be in a _test.go file"))) (error "Must be in a _test.go file")))
;;;###autoload
(defun +go/play-buffer-or-region (&optional beg end)
"TODO"
(interactive "r")
(if (use-region-p)
(go-play-region beg end)
(go-play-buffer)))

View file

@ -24,33 +24,32 @@
(map! :map go-mode-map (map! :map go-mode-map
:localleader :localleader
:n "e" #'go-play-buffer "e" #'+go/play-buffer-or-region
:v "e" #'go-play-region "i" #'go-goto-imports ; Go to imports
:n "i" #'go-goto-imports ; Go to imports
(:prefix "h" (:prefix "h"
:n "." #'godoc-at-point ; Lookup in godoc "." #'godoc-at-point ; Lookup in godoc
:n "d" #'go-guru-describe ; Describe this "d" #'go-guru-describe ; Describe this
:n "v" #'go-guru-freevars ; List free variables "v" #'go-guru-freevars ; List free variables
:n "i" #'go-guru-implements ; Implements relations for package types "i" #'go-guru-implements ; Implements relations for package types
:n "p" #'go-guru-peers ; List peers for channel "p" #'go-guru-peers ; List peers for channel
:n "P" #'go-guru-pointsto ; What does this point to "P" #'go-guru-pointsto ; What does this point to
:n "r" #'go-guru-referrers ; List references to object "r" #'go-guru-referrers ; List references to object
:n "e" #'go-guru-whicherrs ; Which errors "e" #'go-guru-whicherrs ; Which errors
:n "w" #'go-guru-what ; What query "w" #'go-guru-what ; What query
:n "c" #'go-guru-callers ; Show callers of this function "c" #'go-guru-callers ; Show callers of this function
:n "C" #'go-guru-callees) ; Show callees of this function "C" #'go-guru-callees) ; Show callees of this function
(:prefix "r" (:prefix "ri"
:n "ia" #'go-import-add "a" #'go-import-add
:n "ir" #'go-remove-unused-imports) "r" #'go-remove-unused-imports)
(:prefix "b" (:prefix "b"
:n "r" (λ! (compile "go run .")) :desc "go run ." "r" (λ! (compile "go run ."))
:n "b" (λ! (compile "go build")) :desc "go build" "b" (λ! (compile "go build"))
:n "c" (λ! (compile "go clean"))) :desc "go clean" "c" (λ! (compile "go clean")))
(:prefix "t" (:prefix "t"
:n "t" #'+go/test-rerun "t" #'+go/test-rerun
:n "a" #'+go/test-all "a" #'+go/test-all
:n "s" #'+go/test-single "s" #'+go/test-single
:n "n" #'+go/test-nested))) "n" #'+go/test-nested)))
(def-package! gorepl-mode (def-package! gorepl-mode

View file

@ -21,8 +21,8 @@
(add-hook 'dante-mode-hook #'evil-normalize-keymaps)) (add-hook 'dante-mode-hook #'evil-normalize-keymaps))
(map! :map dante-mode-map (map! :map dante-mode-map
:localleader :localleader
:n "t" #'dante-type-at "t" #'dante-type-at
:n "i" #'dante-info "i" #'dante-info
:n "l" #'haskell-process-load-or-reload "l" #'haskell-process-load-or-reload
:n "e" #'dante-eval-block "e" #'dante-eval-block
:n "a" #'attrap-attrap)) "a" #'attrap-attrap))

View file

@ -21,10 +21,10 @@ This is necessary because `intero-mode' doesn't do its own error checks."
(when (featurep 'evil) (when (featurep 'evil)
(add-hook 'intero-mode-hook #'evil-normalize-keymaps)) (add-hook 'intero-mode-hook #'evil-normalize-keymaps))
(map! :map intero-mode-map (map! :localleader
:localleader :map intero-mode-map
:n "t" #'intero-type-at "t" #'intero-type-at
:n "i" #'intero-info "i" #'intero-info
:n "l" #'intero-repl-load "l" #'intero-repl-load
:nv "e" #'intero-repl-eval-region "e" #'intero-repl-eval-region
:n "a" #'intero-apply-suggestions)) "a" #'intero-apply-suggestions))

View file

@ -21,11 +21,10 @@
(add-to-list 'completion-ignored-extensions ".hi") (add-to-list 'completion-ignored-extensions ".hi")
(map! :map haskell-mode-map (map! :localleader
:localleader :map haskell-mode-map
;; this is set to use cabal for dante users and stack for intero users: ;; this is set to use cabal for dante users and stack for intero users:
:n "b" #'haskell-process-cabal-build "b" #'haskell-process-cabal-build
:n "c" #'haskell-cabal-visit-file "c" #'haskell-cabal-visit-file
:v "h" #'haskell-hide-toggle "h" #'haskell-hide-toggle
:nv "H" #'haskell-hide-toggle-all)) "H" #'haskell-hide-toggle-all))

View file

@ -6,14 +6,14 @@
(set-lookup-handlers! 'idris-mode (set-lookup-handlers! 'idris-mode
:documentation #'idris-docs-at-point :documentation #'idris-docs-at-point
:file #'idris-load-file) :file #'idris-load-file)
(map! :map idris-mode-map (map! :localleader
:localleader :map idris-mode-map
:n "r" #'idris-load-file "r" #'idris-load-file
:n "t" #'idris-type-at-point "t" #'idris-type-at-point
:n "d" #'idris-add-clause "d" #'idris-add-clause
:n "l" #'idris-make-lemma "l" #'idris-make-lemma
:n "c" #'idris-case-split "c" #'idris-case-split
:n "w" #'idris-make-with-block "w" #'idris-make-with-block
:n "m" #'idris-add-missing "m" #'idris-add-missing
:n "p" #'idris-proof-search "p" #'idris-proof-search
:n "h" #'idris-docs-at-point)) "h" #'idris-docs-at-point))

View file

@ -16,31 +16,31 @@
help-at-pt-timer-delay 0.1) help-at-pt-timer-delay 0.1)
(help-at-pt-set-timer) (help-at-pt-set-timer)
(map! :map java-mode-map (map! :localleader
:localleader :map java-mode-map
(:prefix "r" (:prefix "r"
:n "gc" #'eclim-java-constructor "gc" #'eclim-java-constructor
:n "gg" #'eclim-java-generate-getter-and-setter "gg" #'eclim-java-generate-getter-and-setter
:n "oi" #'eclim-java-import-organize "oi" #'eclim-java-import-organize
:n "f" #'eclim-java-format "f" #'eclim-java-format
:n "r" #'eclim-java-refactor-rename-symbol-at-point) "r" #'eclim-java-refactor-rename-symbol-at-point)
(:prefix "h" (:prefix "h"
:n "." #'eclim-java-show-documentation-for-current-element "." #'eclim-java-show-documentation-for-current-element
:n "r" #'eclim-java-find-references "r" #'eclim-java-find-references
:n "c" #'eclim-java-call-hierarchy "c" #'eclim-java-call-hierarchy
:n "h" #'eclim-java-hierarchy "h" #'eclim-java-hierarchy
:n "p" #'eclim-problems "p" #'eclim-problems
:n "r" #'meghanada-reference "r" #'meghanada-reference
:n "t" #'meghanada-typeinfo) "t" #'meghanada-typeinfo)
(:prefix "b" (:prefix "b"
:n "b" #'eclim-project-build "b" #'eclim-project-build
:n "c" #'eclim-project-create "c" #'eclim-project-create
:n "d" #'eclim-project-delete "d" #'eclim-project-delete
:n "g" #'eclim-project-goto "g" #'eclim-project-goto
:n "i" #'eclim-project-import "i" #'eclim-project-import
:n "k" #'eclim-project-close "k" #'eclim-project-close
:n "o" #'eclim-project-open "o" #'eclim-project-open
:n "u" #'eclim-project-update))) "u" #'eclim-project-update)))
(def-package! company-emacs-eclim (def-package! company-emacs-eclim

View file

@ -14,16 +14,16 @@
:definition #'meghanada-jump-declaration :definition #'meghanada-jump-declaration
:references #'meghanada-reference) :references #'meghanada-reference)
(map! :map java-mode-map (map! :localleader
:localleader :map java-mode-map
(:prefix "r" (:prefix "r"
:n "ia" #'meghanada-import-all "ia" #'meghanada-import-all
:n "io" #'meghanada-optimize-import "io" #'meghanada-optimize-import
:n "l" #'meghanada-local-variable "l" #'meghanada-local-variable
:n "f" #'meghanada-code-beautify) "f" #'meghanada-code-beautify)
(:prefix "h" (:prefix "h"
:n "r" #'meghanada-reference "r" #'meghanada-reference
:n "t" #'meghanada-typeinfo) "t" #'meghanada-typeinfo)
(:prefix "b" (:prefix "b"
:n "f" #'meghanada-compile-file "f" #'meghanada-compile-file
:n "p" #'meghanada-compile-project))) "p" #'meghanada-compile-project)))

View file

@ -54,7 +54,7 @@
(map! :map js2-mode-map (map! :map js2-mode-map
:localleader :localleader
:n "S" #'+javascript/skewer-this-buffer)) "S" #'+javascript/skewer-this-buffer))
(def-package! rjsx-mode (def-package! rjsx-mode
@ -156,12 +156,12 @@
(add-hook! 'tide-mode-hook (add-hook! 'tide-mode-hook
(add-hook 'kill-buffer-hook #'+javascript|cleanup-tide-processes nil t)) (add-hook 'kill-buffer-hook #'+javascript|cleanup-tide-processes nil t))
(map! :map tide-mode-map (map! :localleader
:localleader :map tide-mode-map
:n "R" #'tide-restart-server "R" #'tide-restart-server
:n "f" #'tide-reformat "f" #'tide-reformat
:n "rs" #'tide-rename-symbol "rs" #'tide-rename-symbol
:n "roi" #'tide-organize-imports)) "roi" #'tide-organize-imports))
(def-package! xref-js2 (def-package! xref-js2
@ -189,39 +189,39 @@
;; `skewer-mode' ;; `skewer-mode'
(map! (:after skewer-mode (map! :localleader
:prefix "s"
(:after skewer-mode
:map skewer-mode-map :map skewer-mode-map
:localleader "E" #'skewer-eval-last-expression
:n "sE" #'skewer-eval-last-expression "e" #'skewer-eval-defun
:n "se" #'skewer-eval-defun "f" #'skewer-load-buffer)
:n "sf" #'skewer-load-buffer)
(:after skewer-css (:after skewer-css
:map skewer-css-mode-map :map skewer-css-mode-map
:localleader "e" #'skewer-css-eval-current-declaration
:n "se" #'skewer-css-eval-current-declaration "r" #'skewer-css-eval-current-rule
:n "sr" #'skewer-css-eval-current-rule "b" #'skewer-css-eval-buffer
:n "sb" #'skewer-css-eval-buffer "c" #'skewer-css-clear-all)
:n "sc" #'skewer-css-clear-all)
(:after skewer-html (:after skewer-html
:map skewer-html-mode-map :map skewer-html-mode-map
:localleader "e" #'skewer-html-eval-tag))
:n "se" #'skewer-html-eval-tag))
;; `npm-mode' ;; `npm-mode'
(map! :after npm-mode (map! :after npm-mode
:map npm-mode-keymap
:localleader :localleader
:n "nn" #'npm-mode-npm-init :map npm-mode-keymap
:n "ni" #'npm-mode-npm-install :prefix "n"
:n "ns" #'npm-mode-npm-install-save "n" #'npm-mode-npm-init
:n "nd" #'npm-mode-npm-install-save-dev "i" #'npm-mode-npm-install
:n "nu" #'npm-mode-npm-uninstall "s" #'npm-mode-npm-install-save
:n "nl" #'npm-mode-npm-list "d" #'npm-mode-npm-install-save-dev
:n "nr" #'npm-mode-npm-run "u" #'npm-mode-npm-uninstall
:n "nv" #'npm-mode-visit-project-file) "l" #'npm-mode-npm-list
"r" #'npm-mode-npm-run
"v" #'npm-mode-visit-project-file)
;; ;;

View file

@ -21,7 +21,7 @@
(when +latex-bibtex-file (when +latex-bibtex-file
(setq reftex-default-bibliography (list (expand-file-name +latex-bibtex-file)))) (setq reftex-default-bibliography (list (expand-file-name +latex-bibtex-file))))
(map! :map reftex-mode-map (map! :map reftex-mode-map
:localleader :n ";" 'reftex-toc) :localleader ";" 'reftex-toc)
(add-hook! 'reftex-toc-mode-hook (add-hook! 'reftex-toc-mode-hook
(reftex-toc-rescan) (reftex-toc-rescan)
(map! :map 'local (map! :map 'local

View file

@ -11,13 +11,13 @@
(advice-add #'ledger-check-version :around #'+ledger*check-version) (advice-add #'ledger-check-version :around #'+ledger*check-version)
;; Restore leader key in ledger reports ;; Restore leader key in ledger reports
(after! ledger-mode (map! :after ledger-mode
(define-key! ledger-report-mode-map :map ledger-report-mode-map
(kbd "C-c C-c") #'ledger-report-edit-report "C-c C-c" #'ledger-report-edit-report
(kbd "C-c C-r") #'ledger-report-redo "C-c C-r" #'ledger-report-redo
(kbd "C-c C-s") #'ledger-report-save) "C-c C-s" #'ledger-report-save
(define-key ledger-reconcile-mode-map :map ledger-reconcile-mode-map
[tab] #'ledger-reconcile-toggle)) [tab] #'ledger-reconcile-toggle)
(def-package! flycheck-ledger (def-package! flycheck-ledger
@ -30,26 +30,27 @@
:hook (ledger-mode . evil-ledger-mode) :hook (ledger-mode . evil-ledger-mode)
:config :config
(set-evil-initial-state! 'ledger-report-mode 'normal) (set-evil-initial-state! 'ledger-report-mode 'normal)
(evil-define-key* 'normal ledger-report-mode-map (map! :map ledger-report-mode-map
"q" #'ledger-report-quit :n "q" #'ledger-report-quit
"RET" #'ledger-report-edit-report :n "RET" #'ledger-report-edit-report
"gd" #'ledger-report-visit-source :n "gd" #'ledger-report-visit-source
"gr" #'ledger-report-redo) :n "gr" #'ledger-report-redo
(evil-define-key* 'motion ledger-mode-map :map ledger-mode-map
"]]" #'ledger-navigate-next-xact-or-directive :m "]]" #'ledger-navigate-next-xact-or-directive
"[[" #'ledger-navigate-prev-xact-or-directive) :m "[[" #'ledger-navigate-prev-xact-or-directive
(map! :map ledger-mode-map
:localleader :localleader
:n "a" #'ledger-add-transaction :map ledger-mode-map
:n "t" #'ledger-toggle-current "a" #'ledger-add-transaction
:n "d" #'ledger-delete-current-transaction "t" #'ledger-toggle-current
:n "r" #'ledger-report "d" #'ledger-delete-current-transaction
:n "R" #'ledger-reconcile "r" #'ledger-report
:n "S" #'ledger-schedule-upcoming "R" #'ledger-reconcile
:v "s" #'ledger-sort-region "s" #'ledger-sort-region
"S" #'ledger-schedule-upcoming
(:prefix "g" (:prefix "g"
:n "s" #'ledger-display-ledger-stats "s" #'ledger-display-ledger-stats
:n "b" #'ledger-display-balance-at-point)) "b" #'ledger-display-balance-at-point))
;; Fix inaccurate keybind message ;; Fix inaccurate keybind message
(defun +ledger*fix-key-help (&rest _) (defun +ledger*fix-key-help (&rest _)
(message "q to quit; gr to redo; RET to edit; C-c C-s to save")) (message "q to quit; gr to redo; RET to edit; C-c C-s to save"))

View file

@ -22,6 +22,6 @@
:modes (lua-mode markdown-mode json-mode) :modes (lua-mode markdown-mode json-mode)
:files (and "main.lua" "conf.lua") :files (and "main.lua" "conf.lua")
:on-load :on-load
(map! :map +lua-love-mode-map (map! :localleader
:localleader :map +lua-love-mode-map
:n "b" #'+lua/run-love-game)) "b" #'+lua/run-love-game))

View file

@ -31,9 +31,9 @@ windows."
(replace-regexp-in-string "[* |<>\"?*]" "" path)) (replace-regexp-in-string "[* |<>\"?*]" "" path))
(advice-add #'nimsuggest--get-temp-file-name :filter-return #'doom*nimsuggest--get-temp-file-name)) (advice-add #'nimsuggest--get-temp-file-name :filter-return #'doom*nimsuggest--get-temp-file-name))
(map! :map nim-mode-map (map! :localleader
:localleader :map nim-mode-map
:n "b" #'nim-compile)) "b" #'nim-compile))
(def-package! flycheck-nim (def-package! flycheck-nim

View file

@ -5,16 +5,16 @@
:config :config
(set-company-backend! 'nix-mode 'company-nixos-options) (set-company-backend! 'nix-mode 'company-nixos-options)
(map! :map nix-mode-map (map! :localleader
:localleader :map nix-mode-map
:n "f" #'nix-update-fetch "f" #'nix-update-fetch
:n "p" #'nix-format-buffer "p" #'nix-format-buffer
:n "r" #'nix-repl-show "r" #'nix-repl-show
:n "s" #'nix-shell "s" #'nix-shell
:n "b" #'nix-build "b" #'nix-build
:n "u" #'nix-unpack "u" #'nix-unpack
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
:n "o" #'helm-nixos-options))) "o" #'helm-nixos-options)))
(def-package! nix-drv-mode (def-package! nix-drv-mode
:mode "\\.drv\\'") :mode "\\.drv\\'")

View file

@ -34,10 +34,10 @@
:config :config
(setq merlin-completion-with-doc t) (setq merlin-completion-with-doc t)
(map! :map tuareg-mode-map (map! :localleader
:localleader :map tuareg-mode-map
:n "t" #'merlin-type-enclosing "t" #'merlin-type-enclosing
:n "a" #'tuareg-find-alternate-file)) "a" #'tuareg-find-alternate-file))
(def-package! flycheck-ocaml (def-package! flycheck-ocaml

View file

@ -339,74 +339,77 @@ between the two."
(advice-add #'evil-org-open-below :around #'+org*evil-org-open-below) (advice-add #'evil-org-open-below :around #'+org*evil-org-open-below)
;; Undo keybinds in `evil-collection-outline' ;; Undo keybinds in `evil-collection-outline'
(evil-define-key* 'normal outline-mode-map (map! :map outline-mode-map
"^" nil :n "^" nil
[backtab] nil :n [backtab] nil
"\M-j" nil "\M-k" nil :n "M-j" nil
"\C-j" nil "\C-k" nil :n "M-k" nil
"]" nil "[" nil) :n "C-j" nil
(evil-define-key* 'insert evil-org-mode-map :n "C-k" nil
;; dedent with shift-tab in insert mode :n "]" nil
[backtab] #'+org/dedent :n "[" nil
;; navigate table cells (from insert-mode)
"\C-l" #'+org/table-next-field :map evil-org-mode-map
"\C-h" #'+org/table-previous-field ;; dedent with shift-tab in insert mode
"\C-k" #'+org/table-previous-row :i [backtab] #'+org/dedent
"\C-j" #'+org/table-next-row) ;; navigate table cells (from insert-mode)
;; expand tables or move fields :i "C-l" #'+org/table-next-field
(evil-define-key* '(insert normal) evil-org-mode-map :i "C-h" #'+org/table-previous-field
(kbd "C-S-l") #'+org/table-append-field-or-shift-right :i "C-k" #'+org/table-previous-row
(kbd "C-S-h") #'+org/table-prepend-field-or-shift-left :i "C-j" #'+org/table-next-row
(kbd "C-S-k") #'org-metaup ;; expand tables or move fields
(kbd "C-S-j") #'org-metadown) :ni "C-S-l" #'+org/table-append-field-or-shift-right
;; more intuitive RET keybinds :ni "C-S-h" #'+org/table-prepend-field-or-shift-left
(evil-define-key* 'insert evil-org-mode-map :ni "C-S-k" #'org-metaup
[return] #'org-return-indent) :ni "C-S-j" #'org-metadown
(evil-define-key* 'normal evil-org-mode-map ;; more intuitive RET keybinds
[return] #'+org/dwim-at-point) :i [return] #'org-return-indent
(evil-define-key* '(insert normal) evil-org-mode-map :n [return] #'+org/dwim-at-point
[M-return] (λ! (+org/insert-item 'below)) :nv [C-return] (λ! (+org/insert-item 'below))
[S-M-return] (λ! (+org/insert-item 'above))) :nv [S-C-return] (λ! (+org/insert-item 'below))
;; more vim-esque org motion keys (:when IS-MAC
(evil-define-key* 'motion evil-org-mode-map ;; textmate-esque newline insertion
"]]" (λ! (org-forward-heading-same-level nil) (org-beginning-of-line)) :nv [s-return] (λ! (+org/insert-item 'below))
"[[" (λ! (org-backward-heading-same-level nil) (org-beginning-of-line)) :nv [S-s-return] (λ! (+org/insert-item 'below)))
"]h" #'org-next-visible-heading ;; more vim-esque org motion keys (not covered by evil-org-mode)
"[h" #'org-previous-visible-heading :m "]]" (λ! (org-forward-heading-same-level nil) (org-beginning-of-line))
"]l" #'org-next-link :m "[[" (λ! (org-backward-heading-same-level nil) (org-beginning-of-line))
"[l" #'org-previous-link :m "]h" #'org-next-visible-heading
"]s" #'org-babel-next-src-block :m "[h" #'org-previous-visible-heading
"[s" #'org-babel-previous-src-block :m "]l" #'org-next-link
"^" #'evil-org-beginning-of-line :m "[l" #'org-previous-link
"0" (λ! (let (visual-line-mode) (org-beginning-of-line)))) :m "]s" #'org-babel-next-src-block
(evil-define-key* 'normal evil-org-mode-map :m "[s" #'org-babel-previous-src-block
"gQ" #'org-fill-paragraph :m "^" #'evil-org-beginning-of-line
;; sensible vim-esque folding keybinds :m "0" (λ! (let (visual-line-mode) (org-beginning-of-line)))
"za" #'+org/toggle-fold :n "gQ" #'org-fill-paragraph
"zA" #'org-shifttab ;; sensible vim-esque folding keybinds
"zc" #'+org/close-fold :n "za" #'+org/toggle-fold
"zC" #'outline-hide-subtree :n "zA" #'org-shifttab
"zm" #'+org/hide-next-fold-level :n "zc" #'+org/close-fold
"zo" #'+org/open-fold :n "zC" #'outline-hide-subtree
"zO" #'outline-show-subtree :n "zm" #'+org/hide-next-fold-level
"zr" #'+org/show-next-fold-level :n "zo" #'+org/open-fold
"zR" #'outline-show-all) :n "zO" #'outline-show-subtree
;; <localleader> :n "zr" #'+org/show-next-fold-level
(map! :map evil-org-mode-map :n "zR" #'outline-show-all
:localleader
:n "d" #'org-deadline ;; <localleader>
:n "t" #'org-todo (:localleader
(:prefix "c" "d" #'org-deadline
:n "c" #'org-clock-in "t" #'org-todo
:n "C" #'org-clock-out (:prefix "c"
:n "g" #'org-clock-goto "c" #'org-clock-in
:n "G" (λ! (org-clock-goto 'select)) "C" #'org-clock-out
:n "x" #'org-clock-cancel)) "g" #'org-clock-goto
(map! :map org-read-date-minibuffer-local-map "G" (λ! (org-clock-goto 'select))
"C-h" (λ! (org-eval-in-calendar '(calendar-backward-day 1))) "x" #'org-clock-cancel))
"C-l" (λ! (org-eval-in-calendar '(calendar-forward-day 1)))
"C-k" (λ! (org-eval-in-calendar '(calendar-backward-week 1))) :map org-read-date-minibuffer-local-map
"C-j" (λ! (org-eval-in-calendar '(calendar-forward-week 1))) "C-h" (λ! (org-eval-in-calendar '(calendar-backward-day 1)))
"C-l" (λ! (org-eval-in-calendar '(calendar-forward-day 1)))
"C-k" (λ! (org-eval-in-calendar '(calendar-backward-week 1)))
"C-j" (λ! (org-eval-in-calendar '(calendar-forward-week 1)))
"C-S-h" (λ! (org-eval-in-calendar '(calendar-backward-month 1))) "C-S-h" (λ! (org-eval-in-calendar '(calendar-backward-month 1)))
"C-S-l" (λ! (org-eval-in-calendar '(calendar-forward-month 1))) "C-S-l" (λ! (org-eval-in-calendar '(calendar-forward-month 1)))
"C-S-k" (λ! (org-eval-in-calendar '(calendar-backward-year 1))) "C-S-k" (λ! (org-eval-in-calendar '(calendar-backward-year 1)))

View file

@ -23,12 +23,12 @@
(sp-local-pair "<?" "?>" :post-handlers '(("| " "SPC" "=") ("||\n[i]" "RET") ("[d2]" "p"))) (sp-local-pair "<?" "?>" :post-handlers '(("| " "SPC" "=") ("||\n[i]" "RET") ("[d2]" "p")))
(sp-local-pair "<?php" "?>" :post-handlers '(("| " "SPC") ("||\n[i]" "RET")))) (sp-local-pair "<?php" "?>" :post-handlers '(("| " "SPC") ("||\n[i]" "RET"))))
(map! :map php-mode-map (map! :localleader
:localleader :map php-mode-map
:prefix "t" :prefix "t"
:n "r" #'phpunit-current-project "r" #'phpunit-current-project
:n "a" #'phpunit-current-class "a" #'phpunit-current-class
:n "s" #'phpunit-current-test)) "s" #'phpunit-current-test))
(def-package! phpactor (def-package! phpactor
@ -53,26 +53,26 @@
default-directory))) default-directory)))
(advice-add #'phpactor-get-working-dir :before #'+php*project-root) (advice-add #'phpactor-get-working-dir :before #'+php*project-root)
(map! :map php-mode-map (map! :localleader
:localleader :map php-mode-map
:prefix "r" :prefix "r"
:n "cc" #'phpactor-copy-class "cc" #'phpactor-copy-class
:n "mc" #'phpactor-move-class "mc" #'phpactor-move-class
:v "oi" #'phpactor-offset-info "oi" #'phpactor-offset-info
:n "t" #'phpactor-transform "t" #'phpactor-transform
:n "ic" #'phpactor-import-class)) "ic" #'phpactor-import-class))
(def-package! php-refactor-mode (def-package! php-refactor-mode
:hook php-mode :hook php-mode
:config :config
(map! :map php-refactor-mode-map (map! :localleader
:localleader :map php-refactor-mode-map
:prefix "r" :prefix "r"
:n "cv" #'php-refactor--convert-local-to-instance-variable "cv" #'php-refactor--convert-local-to-instance-variable
:n "u" #'php-refactor--optimize-use "u" #'php-refactor--optimize-use
:v "xm" #'php-refactor--extract-method "xm" #'php-refactor--extract-method
:n "rv" #'php-refactor--rename-local-variable)) "rv" #'php-refactor--rename-local-variable))
(def-package! php-extras (def-package! php-extras

View file

@ -87,14 +87,14 @@ called.")
(when (featurep 'evil) (when (featurep 'evil)
(add-hook 'anaconda-mode-hook #'evil-normalize-keymaps)) (add-hook 'anaconda-mode-hook #'evil-normalize-keymaps))
(map! :map anaconda-mode-map (map! :localleader
:localleader :map anaconda-mode-map
:prefix "f" :prefix "f"
:nv "d" #'anaconda-mode-find-definitions "d" #'anaconda-mode-find-definitions
:nv "h" #'anaconda-mode-show-doc "h" #'anaconda-mode-show-doc
:nv "a" #'anaconda-mode-find-assignments "a" #'anaconda-mode-find-assignments
:nv "f" #'anaconda-mode-find-file "f" #'anaconda-mode-find-file
:nv "u" #'anaconda-mode-find-references)) "u" #'anaconda-mode-find-references))
(def-package! nose (def-package! nose
@ -107,29 +107,29 @@ called.")
(when (featurep 'evil) (when (featurep 'evil)
(add-hook 'nose-mode-hook #'evil-normalize-keymaps)) (add-hook 'nose-mode-hook #'evil-normalize-keymaps))
(map! :map nose-mode-map (map! :localleader
:localleader :map nose-mode-map
:prefix "t" :prefix "t"
:n "r" #'nosetests-again "r" #'nosetests-again
:n "a" #'nosetests-all "a" #'nosetests-all
:n "s" #'nosetests-one "s" #'nosetests-one
:n "v" #'nosetests-module "v" #'nosetests-module
:n "A" #'nosetests-pdb-all "A" #'nosetests-pdb-all
:n "O" #'nosetests-pdb-one "O" #'nosetests-pdb-one
:n "V" #'nosetests-pdb-module)) "V" #'nosetests-pdb-module))
(def-package! python-pytest (def-package! python-pytest
:defer t :defer t
:init :init
(map! :after python (map! :after python
:map python-mode-map
:localleader :localleader
:map python-mode-map
:prefix "t" :prefix "t"
:nv "f" #'python-pytest-file "f" #'python-pytest-file
:nv "k" #'python-pytest-file-dwim "k" #'python-pytest-file-dwim
:nv "m" #'python-pytest-repeat "m" #'python-pytest-repeat
:nv "p" #'python-pytest-popup)) "p" #'python-pytest-popup))
;; ;;

View file

@ -20,33 +20,33 @@
(add-hook! racket-mode #'(rainbow-delimiters-mode highlight-quoted-mode)) (add-hook! racket-mode #'(rainbow-delimiters-mode highlight-quoted-mode))
(map! :map racket-mode-map (map! :localleader
:localleader :map racket-mode-map
:n "a" #'racket-align "a" #'racket-align
:n "A" #'racket-unalign "A" #'racket-unalign
:n "f" #'racket-fold-all-tests "f" #'racket-fold-all-tests
:n "F" #'racket-unfold-all-tests "F" #'racket-unfold-all-tests
:n "h" #'racket-doc "h" #'racket-doc
:n "i" #'racket-unicode-input-method-enable "i" #'racket-unicode-input-method-enable
:n "l" #'racket-logger "l" #'racket-logger
:n "o" #'racket-profile "o" #'racket-profile
:n "p" #'racket-cycle-paren-shapes "p" #'racket-cycle-paren-shapes
:n "r" #'racket-run "r" #'racket-run
:n "R" #'racket-run-and-switch-to-repl "R" #'racket-run-and-switch-to-repl
:n "t" #'racket-test "t" #'racket-test
:n "u" #'racket-backward-up-list "u" #'racket-backward-up-list
:n "y" #'racket-insert-lambda "y" #'racket-insert-lambda
(:prefix "e" (:prefix "e"
:n "d" #'racket-expand-definition "d" #'racket-expand-definition
:n "l" #'racket-expand-last-sexp "l" #'racket-expand-last-sexp
:n "r" #'racket-expand-region "r" #'racket-expand-region
:n "a" #'racket-expand-again) "a" #'racket-expand-again)
(:prefix "g" (:prefix "g"
:n "d" #'racket-visit-definition "d" #'racket-visit-definition
:n "m" #'racket-visit-module "m" #'racket-visit-module
:n "r" #'racket-open-require-path "r" #'racket-open-require-path
:n "b" #'racket-unvisit) "b" #'racket-unvisit)
(:prefix "s" (:prefix "s"
:n "d" #'racket-send-definition "d" #'racket-send-definition
:n "l" #'racket-send-last-sexp "l" #'racket-send-last-sexp
:n "r" #'racket-send-region))) "r" #'racket-send-region)))

View file

@ -22,9 +22,9 @@
:n "zr" #'outline-show-all :n "zr" #'outline-show-all
:localleader :localleader
:n "e" #'restclient-http-send-current "e" #'restclient-http-send-current
:n "E" #'restclient-http-send-current-raw "E" #'restclient-http-send-current-raw
:n "c" #'restclient-copy-curl-command)) "c" #'restclient-copy-curl-command))
(def-package! company-restclient (def-package! company-restclient

View file

@ -51,17 +51,17 @@
:documentation #'robe-doc) :documentation #'robe-doc)
(map! :localleader (map! :localleader
:map robe-mode-map :map robe-mode-map
:n "'" #'robe-start "'" #'robe-start
;; robe mode specific ;; robe mode specific
:n "h" #'robe-doc "h" #'robe-doc
:n "rr" #'robe-rails-refresh "rr" #'robe-rails-refresh
;; inf-enh-ruby-mode ;; inf-enh-ruby-mode
:prefix "s" :prefix "s"
:n "f" #'ruby-send-definition "f" #'ruby-send-definition
:n "F" #'ruby-send-definition-and-go "F" #'ruby-send-definition-and-go
:n "r" #'ruby-send-region "r" #'ruby-send-region
:n "R" #'ruby-send-region-and-go "R" #'ruby-send-region-and-go
:n "i" #'ruby-switch-to-inf)) "i" #'ruby-switch-to-inf))
;; NOTE Must be loaded before `robe-mode' ;; NOTE Must be loaded before `robe-mode'
@ -72,12 +72,12 @@
(def-package! rubocop (def-package! rubocop
:hook (enh-ruby-mode . rubocop-mode) :hook (enh-ruby-mode . rubocop-mode)
:config :config
(map! :map rubocop-mode-map (map! :localleader
:localleader :map rubocop-mode-map
:nv "f" #'rubocop-check-current-file "f" #'rubocop-check-current-file
:nv "F" #'rubocop-autocorrect-current-file "F" #'rubocop-autocorrect-current-file
:nv "p" #'rubocop-check-project "p" #'rubocop-check-project
:nv "P" #'rubocop-autocorrect-project)) "P" #'rubocop-autocorrect-project))
;; ;;
@ -91,10 +91,10 @@
:localleader :localleader
:map enh-ruby-mode-map :map enh-ruby-mode-map
:prefix "k" :prefix "k"
:n "k" #'rake "k" #'rake
:n "r" #'rake-rerun "r" #'rake-rerun
:n "R" #'rake-regenerate-cache "R" #'rake-regenerate-cache
:n "f" #'rake-find-task)) "f" #'rake-find-task))
(def-package! bundler (def-package! bundler
:defer t :defer t
@ -103,12 +103,12 @@
:localleader :localleader
:map enh-ruby-mode-map :map enh-ruby-mode-map
:prefix "b" :prefix "b"
:n "c" #'bundle-check "c" #'bundle-check
:n "C" #'bundle-console "C" #'bundle-console
:n "i" #'bundle-install "i" #'bundle-install
:n "u" #'bundle-update "u" #'bundle-update
:n "e" #'bundle-exec "e" #'bundle-exec
:n "o" #'bundle-open)) "o" #'bundle-open))
;; `rvm' ;; `rvm'
(setq rspec-use-rvm t) (setq rspec-use-rvm t)
@ -136,20 +136,20 @@
(setq rspec-verifiable-mode-keymap (make-sparse-keymap) (setq rspec-verifiable-mode-keymap (make-sparse-keymap)
rspec-mode-keymap (make-sparse-keymap))) rspec-mode-keymap (make-sparse-keymap)))
:config :config
(map! :map rspec-mode-map (map! :localleader
:localleader :map rspec-mode-map
:prefix "t" :prefix "t"
:n "r" #'rspec-rerun "r" #'rspec-rerun
:n "a" #'rspec-verify-all "a" #'rspec-verify-all
:n "s" #'rspec-verify-single "s" #'rspec-verify-single
:n "v" #'rspec-verify "v" #'rspec-verify
:n "c" #'rspec-verify-continue "c" #'rspec-verify-continue
:n "e" #'rspec-toggle-example-pendingness "e" #'rspec-toggle-example-pendingness
:n "f" #'rspec-verify-method "f" #'rspec-verify-method
:n "l" #'rspec-run-last-failed "l" #'rspec-run-last-failed
:n "m" #'rspec-verify-matching "m" #'rspec-verify-matching
:n "t" #'rspec-toggle-spec-and-target-find-example "t" #'rspec-toggle-spec-and-target-find-example
:n "T" #'rspec-toggle-spec-and-target)) "T" #'rspec-toggle-spec-and-target))
(def-package! minitest (def-package! minitest
@ -157,10 +157,10 @@
:config :config
(when (featurep! :feature evil) (when (featurep! :feature evil)
(add-hook 'minitest-mode-hook #'evil-normalize-keymaps)) (add-hook 'minitest-mode-hook #'evil-normalize-keymaps))
(map! :map minitest-mode-map (map! :localleader
:localleader :map minitest-mode-map
:prefix "t" :prefix "t"
:n "r" #'minitest-rerun "r" #'minitest-rerun
:n "a" #'minitest-verify-all "a" #'minitest-verify-all
:n "s" #'minitest-verify-single "s" #'minitest-verify-single
:n "v" #'minitest-verify)) "v" #'minitest-verify))

View file

@ -61,67 +61,67 @@
(map! :map web-mode-map (map! :map web-mode-map
(:localleader (:localleader
:desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight :desc "Rehighlight buffer" "h" #'web-mode-buffer-highlight
:desc "Indent buffer" :n "i" #'web-mode-buffer-indent :desc "Indent buffer" "i" #'web-mode-buffer-indent
(:prefix "a" (:prefix "a"
:n "b" #'web-mode-attribute-beginning "b" #'web-mode-attribute-beginning
:n "e" #'web-mode-attribute-end "e" #'web-mode-attribute-end
:n "i" #'web-mode-attribute-insert "i" #'web-mode-attribute-insert
:n "n" #'web-mode-attribute-next "n" #'web-mode-attribute-next
:n "s" #'web-mode-attribute-select "s" #'web-mode-attribute-select
:n "k" #'web-mode-attribute-kill "k" #'web-mode-attribute-kill
:n "p" #'web-mode-attribute-previous "p" #'web-mode-attribute-previous
:n "p" #'web-mode-attribute-transpose) "p" #'web-mode-attribute-transpose)
(:prefix "b" (:prefix "b"
:n "b" #'web-mode-block-beginning "b" #'web-mode-block-beginning
:n "c" #'web-mode-block-close "c" #'web-mode-block-close
:n "e" #'web-mode-block-end "e" #'web-mode-block-end
:n "k" #'web-mode-block-kill "k" #'web-mode-block-kill
:n "n" #'web-mode-block-next "n" #'web-mode-block-next
:n "p" #'web-mode-block-previous "p" #'web-mode-block-previous
:n "s" #'web-mode-block-select) "s" #'web-mode-block-select)
(:prefix "d" (:prefix "d"
:n "a" #'web-mode-dom-apostrophes-replace "a" #'web-mode-dom-apostrophes-replace
:n "d" #'web-mode-dom-errors-show "d" #'web-mode-dom-errors-show
:n "e" #'web-mode-dom-entities-encode "e" #'web-mode-dom-entities-encode
:n "n" #'web-mode-dom-normalize "n" #'web-mode-dom-normalize
:n "q" #'web-mode-dom-quotes-replace "q" #'web-mode-dom-quotes-replace
:n "t" #'web-mode-dom-traverse "t" #'web-mode-dom-traverse
:n "x" #'web-mode-dom-xpath) "x" #'web-mode-dom-xpath)
(:prefix "e" (:prefix "e"
:n "/" #'web-mode-element-close "/" #'web-mode-element-close
:n "a" #'web-mode-element-content-select "a" #'web-mode-element-content-select
:n "b" #'web-mode-element-beginning "b" #'web-mode-element-beginning
:n "c" #'web-mode-element-clone "c" #'web-mode-element-clone
:n "d" #'web-mode-element-child "d" #'web-mode-element-child
:n "e" #'web-mode-element-end "e" #'web-mode-element-end
:n "f" #'web-mode-element-children-fold-or-unfold "f" #'web-mode-element-children-fold-or-unfold
:n "i" #'web-mode-element-insert "i" #'web-mode-element-insert
:n "k" #'web-mode-element-kill "k" #'web-mode-element-kill
:n "m" #'web-mode-element-mute-blanks "m" #'web-mode-element-mute-blanks
:n "n" #'web-mode-element-next "n" #'web-mode-element-next
:n "p" #'web-mode-element-previous "p" #'web-mode-element-previous
:n "r" #'web-mode-element-rename "r" #'web-mode-element-rename
:n "s" #'web-mode-element-select "s" #'web-mode-element-select
:n "t" #'web-mode-element-transpose "t" #'web-mode-element-transpose
:n "u" #'web-mode-element-parent "u" #'web-mode-element-parent
:n "v" #'web-mode-element-vanish "v" #'web-mode-element-vanish
:n "w" #'web-mode-element-wrap) "w" #'web-mode-element-wrap)
(:prefix "t" (:prefix "t"
:n "a" #'web-mode-tag-attributes-sort "a" #'web-mode-tag-attributes-sort
:n "b" #'web-mode-tag-beginning "b" #'web-mode-tag-beginning
:n "e" #'web-mode-tag-end "e" #'web-mode-tag-end
:n "m" #'web-mode-tag-match "m" #'web-mode-tag-match
:n "n" #'web-mode-tag-next "n" #'web-mode-tag-next
:n "p" #'web-mode-tag-previous "p" #'web-mode-tag-previous
:n "s" #'web-mode-tag-select)) "s" #'web-mode-tag-select))
"M-/" #'web-mode-comment-or-uncomment :g "M-/" #'web-mode-comment-or-uncomment
:i "SPC" #'self-insert-command :i "SPC" #'self-insert-command
:n "za" #'web-mode-fold-or-unfold :n "za" #'web-mode-fold-or-unfold
:nv "]a" #'web-mode-attribute-next :nv "]a" #'web-mode-attribute-next

View file

@ -9,9 +9,9 @@
ansible::task-label-face 'font-lock-doc-face) ansible::task-label-face 'font-lock-doc-face)
(map! :map ansible::key-map (map! :map ansible::key-map
:localleader :localleader
:n "d" #'ansible::decrypt-buffer :desc "Decrypt buffer" "d" #'ansible::decrypt-buffer
:n "e" #'ansible::encrypt-buffer :desc "Encrypt buffer" "e" #'ansible::encrypt-buffer
:n "h" #'ansible-doc)) :desc "Look up in Ansible docs" "h" #'ansible-doc))
(after! ansible-doc (after! ansible-doc
(set-evil-initial-state! '(ansible-doc-module-mode) 'emacs)) (set-evil-initial-state! '(ansible-doc-module-mode) 'emacs))

View file

@ -3,9 +3,9 @@
(map! :after terraform-mode (map! :after terraform-mode
:map terraform-mode-map :map terraform-mode-map
:localleader :localleader
:n "a" (λ! (compile "terraform apply")) :desc "terraform apply" "a" (λ! (compile "terraform apply"))
:n "i" (λ! (compile "terraform init")) :desc "terraform init" "i" (λ! (compile "terraform init"))
:n "p" (λ! (compile "terraform plan"))) :desc "terraform plan" "p" (λ! (compile "terraform plan")))
(def-package! company-terraform (def-package! company-terraform

View file

@ -19,14 +19,14 @@
(set-evil-initial-state! 'deft-mode 'insert) (set-evil-initial-state! 'deft-mode 'insert)
(map! :map deft-mode-map (map! :map deft-mode-map
:localleader :localleader
:n "RET" #'deft-new-file-named "RET" #'deft-new-file-named
:n "a" #'deft-archive-file "a" #'deft-archive-file
:n "c" #'deft-filter-clear "c" #'deft-filter-clear
:n "d" #'deft-delete-file "d" #'deft-delete-file
:n "f" #'deft-find-file "f" #'deft-find-file
:n "g" #'deft-refresh "g" #'deft-refresh
:n "l" #'deft-filter "l" #'deft-filter
:n "n" #'deft-new-file "n" #'deft-new-file
:n "r" #'deft-rename-file "r" #'deft-rename-file
:n "s" #'deft-toggle-sort-method "s" #'deft-toggle-sort-method
:n "t" #'deft-toggle-incremental-search)) "t" #'deft-toggle-incremental-search))