     :on (setq sort-fold-case t)
     :off (setq sort-fold-case nil)
     :evil-leader "tS")
+
+  ;; Require a final newline even in conf-mode (default is nil).
+  (defun set-require-final-newline ()
+    (set (make-local-variable 'require-final-newline)
+         mode-require-final-newline))
+  (add-hook 'conf-mode-hook #'set-require-final-newline)
 
   ;; For *most* languages I work with 2 space indent is the norm.
   (setq-default evil-shift-width 2)

  ;; https://lists.nongnu.org/archive/html/bug-gnu-emacs/2018-01/msg00260.html
  (push "Noto Color Emoji" face-ignored-fonts)

  ;; Lets trust myself to not create problematic symlinks.
  (setq vc-follow-symlinks t)


    (advice-add 'page-break-lines--update-display-table
                :after #'mfa//buffer-display-table-vertical-border-advice))

  ;; Add support for running go benchmarks
  (with-eval-after-load 'go-mode
    (defun spacemacs/go-run-test-current-function ()
