General cleanup + refactor core.el

core/core.el

@@ -34,9 +34,6 @@ line or use --debug-init to enable this.")
 (defvar doom-modules-dir (concat doom-emacs-dir "modules/")
   "Where configuration modules are stored")
 
-(defvar doom-scripts-dir (concat doom-emacs-dir "scripts/")
-  "Where external dependencies are stored (like libraries or binaries)")
-
 (defvar doom-local-dir (concat doom-emacs-dir ".local/")
   "Untracked directory for local Emacs files, including the cache
 (`doom-cache-dir'), packages (`doom-packages-dir') and autoloads file.")
@@ -49,6 +46,11 @@ line or use --debug-init to enable this.")
   (concat doom-local-dir "packages/")
   "Where package.el and quelpa plugins (and their caches) are kept.")
 
+(defvar doom-autoload-file
+  (concat doom-local-dir "autoloads.el")
+  "Location of the autoloads.el, which is generated by `doom/refresh-autoloads'
+and `doom-initialize-autoloads'.")
+
 (defconst IS-MAC   (eq system-type 'darwin))
 (defconst IS-LINUX (eq system-type 'gnu/linux))
 
@@ -83,6 +85,11 @@ line or use --debug-init to enable this.")
       make-backup-files nil
       vc-make-backup-files nil)
 
+;; be quiet at startup
+(advice-add 'display-startup-echo-area-message :override 'ignore)
+(setq inhibit-startup-message t
+      inhibit-startup-echo-area-message user-login-name)
+
 
 ;;;
 ;; Automatic minor modes
@@ -120,27 +127,20 @@ enable multiple minor modes for the same regexp.")
   (eval-and-compile
     (require 'core-packages (concat doom-core-dir "core-packages")))
   (eval-when-compile
-    ;; Ensure cache folder exist
-    (unless (file-exists-p doom-cache-dir)
-      (make-directory doom-cache-dir t))
     (doom-initialize))
   (setq load-path (eval-when-compile load-path))
 
   ;;; Let 'er rip
   (require 'core-lib)
-  (require 'autoloads (concat doom-local-dir "autoloads.el") t)
   (unless noninteractive
-    (require 'core-set)         ; a centralized config system; provides `set!'
-    (require 'core-states)      ; TODO
     (require 'core-ui)          ; draw me like one of your French editors
     (require 'core-popups)      ; taming sudden yet inevitable windows
     (require 'core-editor)      ; baseline configuration for text editing
-    (require 'core-projects)    ; making Emacs project-aware
+    (require 'core-projects))   ; making Emacs project-aware
 
-    ;; We check last as a promise that the core files won't use autoloaded
-    ;; functions. If they do, it shouldn't be autoloaded!
-    (unless (featurep 'autoloads)
-      (doom/refresh-autoloads))))
+  ;; We do this last to promise that core files will not use autoloaded files.
+  ;; If they did, those functions shouldn't be autoloaded!
+  (doom-initialize-autoloads))
 
 (provide 'core)
 ;;; core.el ends here