Add missing prefixes to global application bindings

layers/+email/notmuch/README.org

@@ -97,7 +97,7 @@ Refer to the official notmuch website for more information:
 | Key binding   | Command                                      |
 |---------------+----------------------------------------------|
 | ~SPC a e n N~ | Start notmuch                                |
-| ~SPC a e n n~ | Start helm notmuch                           |
+| ~SPC a e n n~ | Start helm/counsil notmuch                   |
 | ~SPC a e n j~ | Start a notmuch jump search                  |
 | ~SPC a e n s~ | Start a notmuch search                       |
 | ~SPC l o n~   | Start notmuch in a custom layout, "@Notmuch" |

layers/+email/notmuch/packages.el

@@ -22,12 +22,12 @@
 (defun notmuch/init-counsel-notmuch ()
   (use-package counsel-notmuch
     :defer t
-    :init (spacemacs/set-leader-keys "aNn" 'counsel-notmuch)))
+    :init (spacemacs/set-leader-keys "aenn" 'counsel-notmuch)))
 
 (defun notmuch/init-helm-notmuch ()
   (use-package helm-notmuch
     :defer t
-    :init (spacemacs/set-leader-keys "aNn" 'helm-notmuch)))
+    :init (spacemacs/set-leader-keys "aenn" 'helm-notmuch)))
 
 (defun notmuch/init-notmuch ()
   (use-package notmuch

layers/+lang/windows-scripts/README.org

@@ -28,9 +28,10 @@ file.
 * Key bindings
 ** Powershell (powershell.el)
 
-| Key binding | Description                      |
-|-------------+----------------------------------|
-| ~SPC m r r~ | Transform marked regexp to regex |
+| Key binding   | Description                      |
+|---------------+----------------------------------|
+| ~SPC m r r~   | Transform marked regexp to regex |
+| ~SPC a t s p~ | Start powershell shell           |
 
 ** Batch (dos.el)
 

layers/+lang/windows-scripts/packages.el

@@ -1,6 +1,6 @@
 ;;; packages.el --- Windows Scripts Layer packages File for Spacemacs
 ;;
-;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
+;; Copyright (c) 2012-2020 Sylvain Benner & Contributors
 ;;
 ;; Author: Sylvain Benner <sylvain.benner@gmail.com>
 ;; URL: https://github.com/syl20bnr/spacemacs
@@ -9,14 +9,13 @@
 ;;
 ;;; License: GPLv3
 
-(setq windows-scripts-packages
+(defconst windows-scripts-packages
   '(
     (dos :location local)
     ggtags
     counsel-gtags
     helm-gtags
-    powershell
-    ))
+    powershell))
 
 (defun windows-scripts/init-dos ()
   (use-package dos
@@ -64,16 +63,14 @@
     :init
     (progn
       (defun powershell/define-text-objects ()
-        (spacemacs|define-text-object "$" "dollarparen" "$(" ")")
-        )
+        (spacemacs|define-text-object "$" "dollarparen" "$(" ")"))
       (add-hook 'powershell-mode-hook 'powershell/define-text-objects)
       (spacemacs/set-leader-keys
-        "asp" 'powershell)
+        "atsp" 'powershell)
       (spacemacs/set-leader-keys-for-major-mode 'powershell-mode
         "rr" 'powershell-regexp-to-regex)
-
-    ;; TODO
-    ;; - split out powershell
-    ;; - get help output with mgg (Get-Help) or Get-Help -online
-    ;; -
-    )))
+      ;; TODO
+      ;; - split out powershell
+      ;; - get help output with mgg (Get-Help) or Get-Help -online
+      ;; -
+      )))

layers/+spacemacs/spacemacs-defaults/keybindings.el

@@ -23,9 +23,11 @@
                                        ("ac"   "chat")
                                        ("ae"   "email")
                                        ("af"   "fun")
+                                       ("ar"   "readers")
+                                       ("am"   "music")
                                        ("at"  "tools")
-                                       ("atg" "geolocation")
-                                       ("A"   "other applications")
+                                       ("ats"  "shells")
+                                       ("aw"  "web-services")
                                        ("c"   "compile/comments")
                                        ("C"   "capture/colors")
                                        ("d"   "documentation")

layers/+tools/shell/packages.el

@@ -255,8 +255,7 @@
         "atsm" 'spacemacs/shell-pop-multiterm
         "atst" 'spacemacs/shell-pop-ansi-term
         "atsT" 'spacemacs/shell-pop-term)
-      (spacemacs/declare-prefix "'" "open shell")
-      (spacemacs/declare-prefix "ats" "shells"))
+      (spacemacs/declare-prefix "'" "open shell"))
     :config
     (add-hook 'shell-pop-out-hook #'spacemacs//shell-pop-restore-window)))
 
@@ -329,7 +328,7 @@
     :init
     (progn
       (make-shell-pop-command "vterm" vterm)
-      (spacemacs/set-leader-keys "asv" 'spacemacs/shell-pop-vterm)
+      (spacemacs/set-leader-keys "atsv" 'spacemacs/shell-pop-vterm)
       (spacemacs/register-repl 'vterm 'vterm))
 
     :config