Minor refactors & cleanup

core/core-ui.el

@@ -462,9 +462,7 @@ treat Emacs as a non-application window."
   :init
   (defadvice! doom--disable-all-the-icons-in-tty-a (orig-fn &rest args)
     "Return a blank string in tty Emacs, which doesn't support multiple fonts."
-    :around '(all-the-icons-octicon all-the-icons-material
+    :around #'all-the-icons-insert
-              all-the-icons-faicon all-the-icons-fileicon
-              all-the-icons-wicon all-the-icons-alltheicon)
     (if (display-multi-font-p)
         (apply orig-fn args)
       "")))

modules/emacs/vc/config.el

@@ -65,7 +65,7 @@ info in the `header-line-format' is a good indication."
   (setq-hook! 'git-commit-mode-hook fill-column 72)
 
   (add-hook! 'git-commit-setup-hook
-    (defun +vc-start-in-insert-state-maybe ()
+    (defun +vc-start-in-insert-state-maybe-h ()
       "Start git-commit-mode in insert state if in a blank commit message,
 otherwise in default state."
       (when (and (bound-and-true-p evil-mode)

modules/lang/rust/config.el

@@ -10,10 +10,6 @@
 (use-package! rustic
   :mode ("\\.rs$" . rustic-mode)
   :commands rustic-run-cargo-command rustic-cargo-outdated
-  :preface
-  ;; We use the superior default client provided by `lsp-mode', not the one
-  ;; rustic-mode sets up for us.
-  (setq rustic-lsp-client nil)
   :config
   (set-docsets! 'rustic-mode "Rust")
 
@@ -25,7 +21,10 @@
         ;;        buffers, so we disable it, but only for evil users, because it
         ;;        affects `forward-sexp' and its ilk. See
         ;;        https://github.com/rust-lang/rust-mode/issues/288.
-        rustic-match-angle-brackets (not (featurep! :editor evil)))
+        rustic-match-angle-brackets (not (featurep! :editor evil))
+        ;; We use the superior default client provided by `lsp-mode', not the
+        ;; one rustic-mode sets up for us.
+        rustic-lsp-client nil)
 
   (add-hook 'rustic-mode-hook #'rainbow-delimiters-mode)