Fix keybindings + make them more consistent

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
+        (:localleader
-        :n "b" 'omnisharp-recompile
+         :n "b" 'omnisharp-recompile
 
-        :prefix "r"
+         (:prefix "r"
-        :n "fu" 'omnisharp-find-usages
+           :n "i"  'omnisharp-fix-code-issue-at-point
-        :n "fi" 'omnisharp-find-implementations
+           :n "u"  'omnisharp-fix-usings
-        :n "i"  'omnisharp-fix-code-issue-at-point
+           :n "r"  'omnisharp-rename
-        :n "u"  'omnisharp-fix-usings
+           :n "a"  'omnisharp-show-last-auto-complete-result
-        :n "r"  'omnisharp-rename
+           :n "o"  'omnisharp-show-overloads-at-point)
-        :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 "t"
+         (:prefix "f"
-        :n "tr" (λ! (omnisharp-unit-test "fixture"))
+           :n "u"  'omnisharp-find-usages
-        :n "ts" (λ! (omnisharp-unit-test "single"))
+           :n "i"  'omnisharp-find-implementations
-        :n "ta" (λ! (omnisharp-unit-test "all"))))
+           :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

modules/lang/go/config.el

@@ -14,14 +14,14 @@
   (map! :map go-mode-map
         :n "gd" 'godef-jump
         (:localleader
-         :n "k"  'godef-describe
+         :n "fh"  'godef-describe
-         :prefix "r"
+         (:prefix "r"
-         :n  "i" go-remove-unused-imports
+           :n  "i" go-remove-unused-imports
-         :nv "f" gofmt
+           :nv "f" gofmt)
-         :prefix "t"
+         (:prefix "t"
-         :n "r" '+go/test-run-all
+           :n "r" '+go/test-run-all
-         :n "a" '+go/test-run-all
+           :n "a" '+go/test-run-all
-         :n "s" '+go/test-run-package)))
+           :n "s" '+go/test-run-package))))
 
 
 (def-package! company-go :after go-mode)

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
+  (map! :map bibtex-mode-map "C-c \\" 'bibtex-fill-entry))
-        "C-c \\" 'bibtex-fill-entry))
 
 
 (def-package! reftex ; built-in

modules/lang/php/config.el

@@ -32,16 +32,16 @@
         :localleader
         :nv ";" 'doom/append-semicolon
 
-        :prefix "r"
+        (:prefix "r"
-        :n "cv" 'php-refactor--convert-local-to-instance-variable
+          :n "cv" 'php-refactor--convert-local-to-instance-variable
-        :n "u"  'php-refactor--optimize-use
+          :n "u"  'php-refactor--optimize-use
-        :v "xm" 'php-refactor--extract-method
+          :v "xm" 'php-refactor--extract-method
-        :n "rv" 'php-refactor--rename-local-variable
+          :n "rv" 'php-refactor--rename-local-variable)
 
-        :prefix "t"
+        (:prefix "t"
-        :n "r" 'phpunit-current-project
+          :n "r" 'phpunit-current-project
-        :n "a" 'phpunit-current-class
+          :n "a" 'phpunit-current-class
-        :n "s" 'phpunit-current-test))
+          :n "s" 'phpunit-current-test)))
 
 
 (def-package! php-extras

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
+        (:localleader
-        :n "e" 'processing-export-application
+         :n "e" 'processing-export-application
-        :n "h" 'processing-open-reference
+         :n "h" 'processing-open-reference
-        :n "e" 'processing-open-examples
+         :n "e" 'processing-open-examples
-        :n "o" 'processing-open-sketchbook)
+         :n "o" 'processing-open-sketchbook
+
+         :prefix "f"
+         :n "s" 'processing-find-sketch))
 
   (after! company-keywords
     (nconc company-keywords-alist

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"
+        :prefix "f"
-        :nv "fd" 'anaconda-mode-show-doc
+        :nv "d" 'anaconda-mode-find-definitions
-        :nv "fa" 'anaconda-mode-find-assignments
+        :nv "h" 'anaconda-mode-show-doc
-        :nv "fa" 'anaconda-mode-find-definitions
+        :nv "a" 'anaconda-mode-find-assignments
-        :nv "ff" 'anaconda-mode-find-file
+        :nv "f" 'anaconda-mode-find-file
-        :nv "u"  'anaconda-mode-find-references))
+        :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
+        :prefix "t"
-        :n "ta" 'nosetests-all
+        :n "r" 'nosetests-again
-        :n "ts" 'nosetests-one
+        :n "a" 'nosetests-all
-        :n "tv" 'nosetests-module
+        :n "s" 'nosetests-one
-        :n "tA" 'nosetests-pdb-all
+        :n "v" 'nosetests-module
-        :n "tO" 'nosetests-pdb-one
+        :n "A" 'nosetests-pdb-all
-        :n "tV" 'nosetests-pdb-module))
+        :n "O" 'nosetests-pdb-one
+        :n "V" 'nosetests-pdb-module))
 

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
+        :prefix "t"
-        :n "ta" 'rspec-verify-all
+        :n "r" 'rspec-rerun
-        :n "ts" 'rspec-verify-single
+        :n "a" 'rspec-verify-all
-        :n "tv" 'rspec-verify))
+        :n "s" 'rspec-verify-single
+        :n "v" 'rspec-verify))
 
 
 (def-package! inf-ruby

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

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