diff --git a/core/core-ui.el b/core/core-ui.el
index 26f9b9d70..b76981a04 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -544,22 +544,23 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.")
 
 (defun doom-init-fonts-h ()
   "Loads `doom-font'."
-  (cond (doom-font
-         (cl-pushnew
-          ;; Avoiding `set-frame-font' because it does a lot of extra, expensive
-          ;; work we can avoid by setting the font frame parameter instead.
-          (cons 'font
-                (cond ((stringp doom-font) doom-font)
-                      ((fontp doom-font) (font-xlfd-name doom-font))
-                      ((signal 'wrong-type-argument (list '(fontp stringp)
-                                                          doom-font)))))
-          default-frame-alist
-          :key #'car :test #'eq))
-        ((display-graphic-p)
-         ;; We try our best to record your system font, so `doom-big-font-mode'
-         ;; can still use it to compute a larger font size with.
-         (setq font-use-system-font t
-               doom-font (face-attribute 'default :font)))))
+  (cond
+   (doom-font
+    (cl-pushnew
+     ;; Avoiding `set-frame-font' because it does a lot of extra, expensive
+     ;; work we can avoid by setting the font frame parameter instead.
+     (cons 'font
+           (cond ((stringp doom-font) doom-font)
+                 ((fontp doom-font) (font-xlfd-name doom-font))
+                 ((signal 'wrong-type-argument (list '(fontp stringp)
+                                                     doom-font)))))
+     default-frame-alist
+     :key #'car :test #'eq))
+   ((display-graphic-p)
+    ;; We try our best to record your system font, so `doom-big-font-mode'
+    ;; can still use it to compute a larger font size with.
+    (setq font-use-system-font t
+          doom-font (face-attribute 'default :font)))))
 
 (defun doom-init-extra-fonts-h (&optional frame)
   "Loads `doom-variable-pitch-font',`doom-serif-font' and `doom-unicode-font'."
diff --git a/core/core.el b/core/core.el
index 95fa17048..ca1da38f1 100644
--- a/core/core.el
+++ b/core/core.el
@@ -456,8 +456,7 @@ unreadable. Returns the names of envvars that were changed."
                 exec-path)
               shell-file-name
               (if (member "SHELL" envvars)
-                  (setq shell-file-name
-                        (or (getenv "SHELL") shell-file-name))
+                  (or (getenv "SHELL") shell-file-name)
                 shell-file-name))
         envvars))))
 
diff --git a/modules/checkers/grammar/config.el b/modules/checkers/grammar/config.el
index 830854261..581f207c0 100644
--- a/modules/checkers/grammar/config.el
+++ b/modules/checkers/grammar/config.el
@@ -18,7 +18,8 @@
                  "/usr/share/java/languagetool/languagetool-commandline.jar")))))
 
 
-;; Detects weasel words, passive voice and duplicates
+;; Detects weasel words, passive voice and duplicates. Proselint would be a
+;; better choice.
 (use-package! writegood-mode
   :hook (org-mode markdown-mode rst-mode asciidoc-mode latex-mode)
   :config
diff --git a/modules/ui/neotree/config.el b/modules/ui/neotree/config.el
index af3e2d16c..6d140a672 100644
--- a/modules/ui/neotree/config.el
+++ b/modules/ui/neotree/config.el
@@ -8,7 +8,7 @@
              neotree-find
              neo-global--with-buffer
              neo-global--window-exists-p)
-  :config
+  :init
   (setq neo-create-file-auto-open nil
         neo-auto-indent-point nil
         neo-autorefresh nil
@@ -35,6 +35,7 @@
           "~$"
           "^#.*#$"))
 
+  :config
   (set-popup-rule! "^ ?\\*NeoTree" :ignore t)
 
   (after! winner