Don't kill scratch or dashboard buffer, but cycle through them on kill attempt

core/autoload/buffers.el

@@ -139,7 +139,7 @@ See `doom-real-buffer-p' for what 'real' means."
       (setq destbuf (doom-fallback-buffer))
       (message "Nowhere to go"))
     (prog1
-        (set-buffer destbuf)
+        (switch-to-buffer destbuf)
       (when (eq destbuf (doom-fallback-buffer))
         (cd project-dir)))))
 
@@ -199,8 +199,7 @@ See `doom-real-buffer-p' for what 'real' means."
       (when buffer-win
         (unrecord-window-buffer buffer-win buffer))
       (when only-buffer-window-p
-        (unless (eq buffer (doom-fallback-buffer))
-          (kill-buffer buffer))))
+        (kill-buffer buffer)))
     (eq (current-buffer) buffer)))
 
 ;;;###autoload

core/core-editor.el

@@ -81,6 +81,14 @@
 (global-auto-revert-mode 1)
 (setq auto-revert-verbose nil)
 
+;; don't kill scratch buffers
+(defun doom|dont-kill-scratch-buffer ()
+  (if (not (eq (buffer-name) "*scratch*"))
+      t
+    (bury-buffer)
+    nil))
+(add-hook 'kill-buffer-query-functions 'doom|dont-kill-scratch-buffer)
+
 
 ;;
 ;; Core Plugins