aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorjjanzen <jjanzen@jjanzen.ca>2025-01-08 18:10:12 -0600
committerjjanzen <jjanzen@jjanzen.ca>2025-01-08 18:10:12 -0600
commit1dfc0d5a02ac53154773619b7c44ca419037ae8a (patch)
tree2efeedbf6624a9ba3f91a0e8c908c292a5da18d3 /common
parent19068337ee821b83c43e64a9e0249ce476f484bf (diff)
system changes
Diffstat (limited to 'common')
l---------common/.config/emacs/.#init.el.org1
-rw-r--r--common/.config/emacs/init.el.org59
2 files changed, 43 insertions, 17 deletions
diff --git a/common/.config/emacs/.#init.el.org b/common/.config/emacs/.#init.el.org
new file mode 120000
index 0000000..cbc1997
--- /dev/null
+++ b/common/.config/emacs/.#init.el.org
@@ -0,0 +1 @@
+jjanzen@macos.local.9193 \ No newline at end of file
diff --git a/common/.config/emacs/init.el.org b/common/.config/emacs/init.el.org
index d5573ff..a496c27 100644
--- a/common/.config/emacs/init.el.org
+++ b/common/.config/emacs/init.el.org
@@ -28,23 +28,48 @@ Suppress native compilation warnings and errors. Native compilation seems to be
Bootstrap package management. I use =straight= with =use-package= to allow declarative package management and include =git= repositories in addition to =elpa= / =melpa=.
#+begin_src emacs-lisp
- (defvar bootstrap-version)
- (let ((bootstrap-file
- (expand-file-name
- "straight/repos/straight.el/bootstrap.el"
- (or (bound-and-true-p straight-base-dir)
- user-emacs-directory)))
- (bootstrap-version 7))
- (unless (file-exists-p bootstrap-file)
- (with-current-buffer
- (url-retrieve-synchronously
- "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
- 'silent 'inhibit-cookies)
- (goto-char (point-max))
- (eval-print-last-sexp)))
- (load bootstrap-file nil ':nomessage))
- (straight-use-package 'use-package)
- (setq straight-use-package-by-default t)
+ (defvar elpaca-installer-version 0.8)
+ (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
+ (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
+ (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+ (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
+ :ref nil :depth 1
+ :files (:defaults "elpaca-test.el" (:exclude "extensions"))
+ :build (:not elpaca--activate-package)))
+ (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
+ (build (expand-file-name "elpaca/" elpaca-builds-directory))
+ (order (cdr elpaca-order))
+ (default-directory repo))
+ (add-to-list 'load-path (if (file-exists-p build) build repo))
+ (unless (file-exists-p repo)
+ (make-directory repo t)
+ (when (< emacs-major-version 28) (require 'subr-x))
+ (condition-case-unless-debug err
+ (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+ ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+ ,@(when-let* ((depth (plist-get order :depth)))
+ (list (format "--depth=%d" depth) "--no-single-branch"))
+ ,(plist-get order :repo) ,repo))))
+ ((zerop (call-process "git" nil buffer t "checkout"
+ (or (plist-get order :ref) "--"))))
+ (emacs (concat invocation-directory invocation-name))
+ ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+ "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+ ((require 'elpaca))
+ ((elpaca-generate-autoloads "elpaca" repo)))
+ (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+ (error "%s" (with-current-buffer buffer (buffer-string))))
+ ((error) (warn "%s" err) (delete-directory repo 'recursive))))
+ (unless (require 'elpaca-autoloads nil t)
+ (require 'elpaca)
+ (elpaca-generate-autoloads "elpaca" repo)
+ (load "./elpaca-autoloads")))
+ (add-hook 'after-init-hook #'elpaca-process-queues)
+ (elpaca `(,@elpaca-order))
+
+ (elpaca elpaca-use-package
+ ;; Enable use-package :ensure support for Elpaca.
+ (elpaca-use-package-mode))
#+end_src
* Appearance