From 032726b6100f17208cf1ad7497013f22b5ed8c91 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 12 Apr 2020 12:25:06 -0400 Subject: [PATCH 1/1] Add Borg and assimilate auto-compile and use-package --- .gitmodules | 12 ++++++++++++ Makefile | 9 +++++++++ init.el | 19 +++++++++++++++++++ lib/auto-compile | 1 + lib/borg | 1 + lib/packed | 1 + lib/use-package | 1 + 7 files changed, 44 insertions(+) create mode 100644 .gitmodules create mode 100644 Makefile create mode 160000 lib/auto-compile create mode 160000 lib/borg create mode 160000 lib/packed create mode 160000 lib/use-package diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..61b63fa --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "auto-compile"] + path = lib/auto-compile + url = https://github.com/emacscollective/auto-compile.git +[submodule "borg"] + path = lib/borg + url = https://github.com/emacscollective/borg.git +[submodule "packed"] + path = lib/packed + url = https://github.com/emacscollective/packed.git +[submodule "use-package"] + path = lib/use-package + url = https://github.com/jwiegley/use-package.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c36f3ba --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +-include lib/borg/borg.mk + +bootstrap-borg: + @git submodule--helper clone --name borg --path lib/borg \ + --url git@github.com:emacscollective/borg.git + @cd lib/borg; git symbolic-ref HEAD refs/heads/master + @cd lib/borg; git reset --hard HEAD + +i: build-init diff --git a/init.el b/init.el index ec5c9ab..22b7b68 100644 --- a/init.el +++ b/init.el @@ -112,6 +112,14 @@ ;; for emacs 27 and later, we use early-init.el. see ;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b +(progn ; `borg' + (add-to-list 'load-path + (expand-file-name "lib/borg" user-emacs-directory)) + (require 'borg) + (borg-initialize) + (setq borg-rewrite-urls-alist + '(("git@github.com:" . "https://github.com/") + ("git@gitlab.com:" . "https://gitlab.com/")))) ;; use-package (if nil ; set to t when need to debug init @@ -140,6 +148,17 @@ (defalias 'b/etc 'no-littering-expand-etc-file-name) (defalias 'b/var 'no-littering-expand-var-file-name)) +(use-package auto-compile + :demand + :config + (auto-compile-on-load-mode) + (auto-compile-on-save-mode) + (setq auto-compile-display-buffer nil) + (setq auto-compile-mode-line-counter t) + (setq auto-compile-source-recreate-deletes-dest t) + (setq auto-compile-toggle-deletes-nonlib-dest t) + (setq auto-compile-update-autoloads t)) + ;; separate custom file (don't want it mixing with init.el) (use-package custom :no-require diff --git a/lib/auto-compile b/lib/auto-compile new file mode 160000 index 0000000..3e92c5b --- /dev/null +++ b/lib/auto-compile @@ -0,0 +1 @@ +Subproject commit 3e92c5b1a94b0cf43f2d624180a1cb01df92afd8 diff --git a/lib/borg b/lib/borg new file mode 160000 index 0000000..3cfb35f --- /dev/null +++ b/lib/borg @@ -0,0 +1 @@ +Subproject commit 3cfb35f5c54a76f200272ed11b4a39f11a57552c diff --git a/lib/packed b/lib/packed new file mode 160000 index 0000000..c41c3df --- /dev/null +++ b/lib/packed @@ -0,0 +1 @@ +Subproject commit c41c3dfda86ae33832ffc146923e2a4675cbacfa diff --git a/lib/use-package b/lib/use-package new file mode 160000 index 0000000..c873d55 --- /dev/null +++ b/lib/use-package @@ -0,0 +1 @@ +Subproject commit c873d5529c9c80cb58222f22873a4f081c307cb2 -- 2.20.1