awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-15 13:23:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

General cleanup

Browse Source
This commit is contained in:
Henrik Lissner
2016-05-21 23:12:50 -04:00
parent eb9defe2e7
commit 42e6b0913d
18 changed files with 164 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
bootstrap.el
View File

@@ -1,42 +1,40 @@
;;; bootstrap.el
(eval-when-compile (require 'cl-lib))
(defalias '! 'eval-when-compile)
;; For benchmarking
(defconst emacs-start-time (current-time))
(defconst emacs-end-time nil)
;; Global constants
(eval-and-compile
(defconst emacs-start-time (current-time))
(defconst emacs-end-time nil)
(defconst doom-default-theme 'wombat)
(defconst doom-terminal-theme 'wombat)
(defconst doom-default-font nil)
(defconst doom-default-theme 'wombat)
(defconst doom-terminal-theme 'wombat)
(defconst doom-default-font nil)
(defconst doom-emacs-dir (! (expand-file-name "." user-emacs-directory)))
(defconst doom-core-dir (! (concat doom-emacs-dir "/core")))
(defconst doom-modules-dir (! (concat doom-emacs-dir "/modules")))
(defconst doom-private-dir (! (concat doom-emacs-dir "/private")))
(defconst doom-packages-dir (! (concat doom-emacs-dir "/.cask/" emacs-version "/elpa")))
(defconst doom-script-dir (! (concat doom-emacs-dir "/scripts")))
(defconst doom-ext-dir (! (concat doom-emacs-dir "/ext")))
(defconst doom-snippet-dirs (! (list (concat doom-private-dir "/snippets")
(concat doom-private-dir "/templates"))))
;; Hostname and emacs version-based elisp temp directories
(defconst doom-temp-dir (! (format "%s/cache/%s/%s.%s"
doom-private-dir (system-name)
emacs-major-version emacs-minor-version)))
(defconst doom-emacs-dir (expand-file-name "." user-emacs-directory))
(defconst doom-core-dir (concat doom-emacs-dir "/core"))
(defconst doom-modules-dir (concat doom-emacs-dir "/modules"))
(defconst doom-private-dir (concat doom-emacs-dir "/private"))
(defconst doom-packages-dir (concat doom-emacs-dir "/.cask/" emacs-version "/elpa"))
(defconst doom-script-dir (concat doom-emacs-dir "/scripts"))
(defconst doom-ext-dir (concat doom-emacs-dir "/ext"))
(defconst doom-snippet-dirs (list (concat doom-private-dir "/snippets")
(concat doom-private-dir "/templates")))
;; Hostname and emacs version-based elisp temp directories
(defconst doom-temp-dir (format "%s/cache/%s/%s.%s"
doom-private-dir (system-name)
emacs-major-version emacs-minor-version))
(defconst IS-MAC (! (eq system-type 'darwin)))
(defconst IS-LINUX (! (eq system-type 'gnu/linux)))
(defconst IS-WINDOWS (! (eq system-type 'windows-nt)))
(defconst IS-MAC (eq system-type 'darwin))
(defconst IS-LINUX (eq system-type 'gnu/linux))
(defconst IS-WINDOWS (eq system-type 'windows-nt)))
(eval-when-compile
(defvar doom--load-path load-path)
;; Helper for traversing subdirectories recursively
(defun --subdirs (path &optional include-self)
(let ((result (if include-self (list path) (list))))
(dolist (file (ignore-errors (directory-files path t "^[^.]" t)))
(when (file-directory-p file)
(push file result)))
result)))
(defvar doom--load-path load-path)
;; Helper for traversing subdirectories recursively
(defun --subdirs (path &optional include-self)
(let ((result (if include-self (list path) (list))))
(dolist (file (ignore-errors (directory-files path t "^[^.]" t)))
(when (file-directory-p file)
(push file result)))
result))
;;
@@ -57,16 +55,15 @@
file-name-handler-alist)
;; Scan various folders to populate the load-paths
(setq load-path
(eval-when-compile
(append (list doom-private-dir)
(--subdirs doom-core-dir t)
(--subdirs doom-modules-dir t)
(--subdirs doom-packages-dir)
(--subdirs (expand-file-name "../bootstrap" doom-packages-dir))
doom--load-path))
(! (append (list doom-private-dir)
(--subdirs doom-core-dir t)
(--subdirs doom-modules-dir t)
(--subdirs doom-packages-dir)
(--subdirs (expand-file-name "../bootstrap" doom-packages-dir))
doom--load-path))
custom-theme-load-path
(append (list (expand-file-name "themes/" doom-private-dir))
custom-theme-load-path))
(! (append (list (expand-file-name "themes/" doom-private-dir))
custom-theme-load-path)))
(load "~/.emacs.local.el" t t)
(setq doom-current-theme (if (display-graphic-p) doom-default-theme doom-terminal-theme)
@@ -75,6 +72,9 @@
(when (display-graphic-p)
(require 'server)
(unless (server-running-p)
(server-start)))))
(server-start)))
;; Prevent any auto-displayed text + benchmarking
(advice-add 'display-startup-echo-area-message :override 'ignore)
(message "")))
;;; bootstrap.el ends here