diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index a546939ea..20122b6ff 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -18,31 +18,33 @@ ;; Map all refactor commands (see emr) (map! :map omnisharp-mode-map - :n "gd" 'omnisharp-go-to-definition + :m "gd" 'omnisharp-go-to-definition - :localleader - :n "b" 'omnisharp-recompile + (:localleader + :n "b" 'omnisharp-recompile - :prefix "r" - :n "fu" 'omnisharp-find-usages - :n "fi" 'omnisharp-find-implementations - :n "i" 'omnisharp-fix-code-issue-at-point - :n "u" 'omnisharp-fix-usings - :n "r" 'omnisharp-rename - :n "ti" 'omnisharp-current-type-information - :n "td" 'omnisharp-current-type-documentation - :n "gf" 'omnisharp-navigate-to-current-file-member - :n "gm" 'omnisharp-navigate-to-solution-member - :n "gM" 'omnisharp-navigate-to-solution-file-then-file-member - :n "gF" 'omnisharp-navigate-to-solution-file - :n "gr" 'omnisharp-navigate-to-region - :n "a" 'omnisharp-show-last-auto-complete-result - :n "o" 'omnisharp-show-overloads-at-point + (:prefix "r" + :n "i" 'omnisharp-fix-code-issue-at-point + :n "u" 'omnisharp-fix-usings + :n "r" 'omnisharp-rename + :n "a" 'omnisharp-show-last-auto-complete-result + :n "o" 'omnisharp-show-overloads-at-point) - :prefix "t" - :n "tr" (λ! (omnisharp-unit-test "fixture")) - :n "ts" (λ! (omnisharp-unit-test "single")) - :n "ta" (λ! (omnisharp-unit-test "all")))) + (:prefix "f" + :n "u" 'omnisharp-find-usages + :n "i" 'omnisharp-find-implementations + :n "f" 'omnisharp-navigate-to-current-file-member + :n "m" 'omnisharp-navigate-to-solution-member + :n "M" 'omnisharp-navigate-to-solution-file-then-file-member + :n "F" 'omnisharp-navigate-to-solution-file + :n "r" 'omnisharp-navigate-to-region + :n "ti" 'omnisharp-current-type-information + :n "td" 'omnisharp-current-type-documentation) + + (:prefix "t" + :n "r" (λ! (omnisharp-unit-test "fixture")) + :n "s" (λ! (omnisharp-unit-test "single")) + :n "a" (λ! (omnisharp-unit-test "all")))))) (def-package! shader-mode :mode "\\.shader$") ; unity shaders diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el index 6de64d887..c322bf262 100644 --- a/modules/lang/go/config.el +++ b/modules/lang/go/config.el @@ -14,14 +14,14 @@ (map! :map go-mode-map :n "gd" 'godef-jump (:localleader - :n "k" 'godef-describe - :prefix "r" - :n "i" go-remove-unused-imports - :nv "f" gofmt - :prefix "t" - :n "r" '+go/test-run-all - :n "a" '+go/test-run-all - :n "s" '+go/test-run-package))) + :n "fh" 'godef-describe + (:prefix "r" + :n "i" go-remove-unused-imports + :nv "f" gofmt) + (:prefix "t" + :n "r" '+go/test-run-all + :n "a" '+go/test-run-all + :n "s" '+go/test-run-package)))) (def-package! company-go :after go-mode) diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index 345b54445..7f6cea4aa 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -37,8 +37,7 @@ bibtex-text-indentation 20 bibtex-completion-bibliography (list +latex-bibtex-default-file)) - (map! :map bibtex-mode-map - "C-c \\" 'bibtex-fill-entry)) + (map! :map bibtex-mode-map "C-c \\" 'bibtex-fill-entry)) (def-package! reftex ; built-in diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 1cd1cd7d2..0ddcd3d51 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -32,16 +32,16 @@ :localleader :nv ";" 'doom/append-semicolon - :prefix "r" - :n "cv" 'php-refactor--convert-local-to-instance-variable - :n "u" 'php-refactor--optimize-use - :v "xm" 'php-refactor--extract-method - :n "rv" 'php-refactor--rename-local-variable + (:prefix "r" + :n "cv" 'php-refactor--convert-local-to-instance-variable + :n "u" 'php-refactor--optimize-use + :v "xm" 'php-refactor--extract-method + :n "rv" 'php-refactor--rename-local-variable) - :prefix "t" - :n "r" 'phpunit-current-project - :n "a" 'phpunit-current-class - :n "s" 'phpunit-current-test)) + (:prefix "t" + :n "r" 'phpunit-current-project + :n "a" 'phpunit-current-class + :n "s" 'phpunit-current-test))) (def-package! php-extras diff --git a/modules/lang/processing/config.el b/modules/lang/processing/config.el index c8f5f0ac2..6538ee032 100644 --- a/modules/lang/processing/config.el +++ b/modules/lang/processing/config.el @@ -24,13 +24,15 @@ (map! :map processing-mode-map :nv "M-r" 'processing-sketch-run :m "gd" 'processing-find-in-reference - :m "gF" 'processing-find-sketch - :localleader - :n "e" 'processing-export-application - :n "h" 'processing-open-reference - :n "e" 'processing-open-examples - :n "o" 'processing-open-sketchbook) + (:localleader + :n "e" 'processing-export-application + :n "h" 'processing-open-reference + :n "e" 'processing-open-examples + :n "o" 'processing-open-sketchbook + + :prefix "f" + :n "s" 'processing-find-sketch)) (after! company-keywords (nconc company-keywords-alist diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index ffe421d44..5e9d4ef54 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -41,13 +41,14 @@ :after anaconda-mode :config (map! :map python-mode-map + :m "gd" 'anaconda-mode-find-definitions :localleader - :prefix "r" - :nv "fd" 'anaconda-mode-show-doc - :nv "fa" 'anaconda-mode-find-assignments - :nv "fa" 'anaconda-mode-find-definitions - :nv "ff" 'anaconda-mode-find-file - :nv "u" 'anaconda-mode-find-references)) + :prefix "f" + :nv "d" 'anaconda-mode-find-definitions + :nv "h" 'anaconda-mode-show-doc + :nv "a" 'anaconda-mode-find-assignments + :nv "f" 'anaconda-mode-find-file + :nv "u" 'anaconda-mode-find-references)) (def-package! pip-requirements @@ -65,11 +66,12 @@ (set! :yas-minor-mode 'nose-mode) (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)) + :prefix "t" + :n "r" 'nosetests-again + :n "a" 'nosetests-all + :n "s" 'nosetests-one + :n "v" 'nosetests-module + :n "A" 'nosetests-pdb-all + :n "O" 'nosetests-pdb-one + :n "V" 'nosetests-pdb-module)) diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el index b2d248730..d1e90b626 100644 --- a/modules/lang/ruby/config.el +++ b/modules/lang/ruby/config.el @@ -19,11 +19,11 @@ :localleader :prefix "r" :nv "b" 'ruby-toggle-block + :nv "ec" 'ruby-refactor-extract-constant + :nv "el" 'ruby-refactor-extract-to-let :nv "em" 'ruby-refactor-extract-to-method :nv "ev" 'ruby-refactor-extract-local-variable - :nv "ec" 'ruby-refactor-extract-constant :nv "ad" 'ruby-refactor-add-parameter - :nv "el" 'ruby-refactor-extract-to-let :nv "cc" 'ruby-refactor-convert-post-conditional)) @@ -56,10 +56,11 @@ :config (map! :map rspec-mode-map :localleader - :n "tr" 'rspec-rerun - :n "ta" 'rspec-verify-all - :n "ts" 'rspec-verify-single - :n "tv" 'rspec-verify)) + :prefix "t" + :n "r" 'rspec-rerun + :n "a" 'rspec-verify-all + :n "s" 'rspec-verify-single + :n "v" 'rspec-verify)) (def-package! inf-ruby diff --git a/modules/lang/typescript/config.el b/modules/lang/typescript/config.el index ef5176df7..6a6806191 100644 --- a/modules/lang/typescript/config.el +++ b/modules/lang/typescript/config.el @@ -32,7 +32,8 @@ (map! :map typescript-mode-map :m "gd" 'tide-jump-to-definition - :m "K" 'tide-documentation-at-point)) + :localleader + :m "fh" 'tide-documentation-at-point)) (def-package! tide diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el index 12108266a..81d35cfb4 100644 --- a/modules/lang/web/+html.el +++ b/modules/lang/web/+html.el @@ -19,7 +19,7 @@ (advice-add 'web-mode-fold-or-unfold :after 'nlinum--flush) (map! :map web-mode-map - (:localleader :n "t" 'web-mode-element-rename) + (:localleader :n "rt" 'web-mode-element-rename) "M-/" 'web-mode-comment-or-uncomment :i "SPC" 'self-insert-command :n "M-r" 'doom/web-refresh-browser