mir/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fiddle with broken elpaca stuff again

Browse Source
This commit is contained in:
MitchMarq42 2022-11-01 14:15:05 -08:00
parent f524f9f395
commit f48e290360
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init.el
View File

@ -64,7 +64,8 @@
(defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (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 bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (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)
;; actually, use elpaca instead ;; actually, use elpaca instead
;; (require 'elpaca-bootstrap) (elpaca 'use-package (require 'use-package)) ;; (require 'elpaca-bootstrap) (elpaca use-package (require 'use-package))
;; actually, don't because it's broken on Windows ;; actually, don't because it's broken on Windows
(require 'mitch-packages) (require 'mitch-packages)

3
lisp/elpaca-bootstrap.el
View File

@ -6,8 +6,9 @@
;;; Code: ;;; Code:
(declare-function elpaca-generate-autoloads "elpaca") (declare-function elpaca-generate-autoloads "elpaca")
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(when-let ((elpaca-repo (expand-file-name "repos/elpaca/" elpaca-directory)) (when-let ((elpaca-repo (expand-file-name "repos/elpaca/" elpaca-directory))
(elpaca-build (expand-file-name "builds/elpaca/" elpaca-directory)) (elpaca-build (expand-file-name "elpaca/" elpaca-builds-directory))
(elpaca-target (if (file-exists-p elpaca-build) elpaca-build elpaca-repo)) (elpaca-target (if (file-exists-p elpaca-build) elpaca-build elpaca-repo))
(elpaca-url "https://www.github.com/progfolio/elpaca.git") (elpaca-url "https://www.github.com/progfolio/elpaca.git")
((add-to-list 'load-path elpaca-target)) ((add-to-list 'load-path elpaca-target))