Minor refactors & reformatting

core/core-ui.el

@@ -544,7 +544,8 @@ 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
+  (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.

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))))
 

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

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