General reformatting & minor refactors

core/autoload/packages.el

@@ -372,7 +372,7 @@ package.el as appropriate."
   (cl-check-type name symbol)
   (doom-initialize-packages)
   (unless (package-installed-p name)
-    (user-error "%s isn't installed" name))
+    (error "%s isn't installed" name))
   (when (doom-package-different-backend-p name)
     (user-error "%s's backend has changed and must be uninstalled first" name))
   (when (or force-p (doom-package-outdated-p name))

core/core-keybinds.el

@@ -76,14 +76,14 @@ If any hook returns non-nil, all hooks after it are ignored.")
 (after! evil
   (defmacro define-leader-key! (&rest args)
     `(general-define-key
-      :states '(normal visual motion insert emacs)
+      :states '(normal visual motion emacs)
       :keymaps 'doom-leader-map
       :prefix doom-leader-key
       :non-normal-prefix doom-leader-alt-key
       ,@args))
 
   (general-create-definer define-localleader-key!
-    :states '(normal visual motion insert emacs)
+    :states '(normal visual motion emacs)
     :major-modes t
     :wk-full-keys nil
     :prefix doom-localleader-key

modules/lang/data/config.el

@@ -27,7 +27,7 @@
   :mode "\\.gql\\'")
 
 (def-package! json-mode
-  :mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)\\'"
+  :mode "\\.js\\(?:on\\|[hl]int\\(?:rc\\)?\\)\\'"
   :config
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 

modules/ui/window-select/config.el

@@ -4,7 +4,7 @@
   :when (featurep! +switch-window)
   :defer t
   :init
-  (define-key global-map [remap other-window] #'switch-window)
+  (global-set-key [remap other-window] #'switch-window)
   :config
   (setq switch-window-shortcut-style 'qwerty
         switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l")))
@@ -14,7 +14,7 @@
   :unless (featurep! +switch-window)
   :defer t
   :init
-  (define-key global-map [remap other-window] #'ace-window)
+  (global-set-key [remap other-window] #'ace-window)
   :config
   (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
         aw-scope 'frame