diff --git a/.borgconfig b/.borgconfig new file mode 100644 index 0000000..d6cea4d --- /dev/null +++ b/.borgconfig @@ -0,0 +1,9 @@ +[submodule "dash"] + no-byte-compile = dash-functional.el + no-makeinfo = dash-template.texi +[submodule "emacsql"] + no-byte-compile = emacsql-pg.el +[submodule "magit"] + no-byte-compile = lisp/magit-libgit.el +[submodule "sqlite3"] + build-step = make diff --git a/.dir-locals.el b/.dir-locals.el index 7039f29..ecedf7c 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,2 +1,6 @@ -((git-commit-mode - (git-commit-major-mode . git-commit-elisp-text-mode))) +( + (auto-mode-alist + ("\\.\\(borgconfig\\|gitremotes\\)\\'" . gitconfig-mode)) + (git-commit-mode + (git-commit-major-mode . git-commit-elisp-text-mode)) + ) diff --git a/.gitmodules b/.gitmodules index 24b3604..ed9fde2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[borg] - pushDefault = locutus - collective = emacsg +[include] + path = .gitremotes + path = .borgconfig [submodule "auto-compile"] path = lib/auto-compile url = git@github.com:emacscollective/auto-compile.git @@ -14,15 +14,12 @@ path = lib/compat url = https://git.sr.ht/~pkal/compat [submodule "dash"] - no-byte-compile = dash-functional.el - no-makeinfo = dash-template.texi path = lib/dash url = git@github.com:magnars/dash.el.git [submodule "diff-hl"] path = lib/diff-hl url = git@github.com:dgutov/diff-hl.git [submodule "emacsql"] - no-byte-compile = emacsql-pg.el path = lib/emacsql url = git@github.com:magit/emacsql.git [submodule "epkg"] @@ -41,7 +38,6 @@ path = lib/llama url = https://git.sr.ht/~tarsius/llama [submodule "magit"] - no-byte-compile = lisp/magit-libgit.el path = lib/magit url = git@github.com:magit/magit.git [submodule "magit-imerge"] @@ -60,7 +56,6 @@ path = lib/orgit-forge url = git@github.com:magit/orgit-forge.git [submodule "sqlite3"] - build-step = make path = lib/sqlite3 url = git@github.com:pekingduck/emacs-sqlite3-api.git [submodule "transient"] diff --git a/.gitremotes b/.gitremotes new file mode 100644 index 0000000..ee62b6f --- /dev/null +++ b/.gitremotes @@ -0,0 +1,2 @@ +[borg] + pushDefault = locutus diff --git a/Makefile b/Makefile index d280b49..ac8caa4 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ bootstrap-borg: @mkdir .git/modules @git clone https://github.com/emacscollective/borg lib/borg \ --separate-git-dir .git/modules/borg - @cd lib/borg; git symbolic-ref HEAD refs/heads/master + @cd lib/borg; git symbolic-ref HEAD refs/heads/main @cd lib/borg; git reset --hard HEAD else @@ -27,16 +27,16 @@ helpall:: codespell-dry: @cd lib; codespell \ - --ignore-words ~/.emacs.d/etc/codespell/ignore-words \ - --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \ + --ignore-words ../etc/codespell/ignore-words \ + --exclude-file ../etc/codespell/ignore-lines \ --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \ - ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",") + etc/codespell/ignore-files | tr "\\n" ",") codespell-fix: @cd lib; codespell --write-changes \ - --ignore-words ~/.emacs.d/etc/codespell/ignore-words \ - --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \ + --ignore-words ../etc/codespell/ignore-words \ + --exclude-file ../etc/codespell/ignore-lines \ --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \ - ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",") + etc/codespell/ignore-files | tr "\\n" ",") endif diff --git a/init.el b/init.el index e3ef9ee..43281e7 100644 --- a/init.el +++ b/init.el @@ -33,7 +33,9 @@ (require 'use-package) (setq use-package-verbose t)) -(use-package dash) +(use-package dash + :config (global-dash-fontify-mode)) + (use-package eieio) (use-package auto-compile @@ -74,9 +76,6 @@ :config (setq auto-revert-verbose nil)) -(use-package dash - :config (global-dash-fontify-mode)) - (use-package diff-hl :config (setq diff-hl-draw-borders nil) diff --git a/lib/auto-compile b/lib/auto-compile index a80a874..36646df 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit a80a8742bc322c67c32f32f9e7833817d1a126d2 +Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404 diff --git a/lib/borg b/lib/borg index fdce5ec..f9b3413 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit fdce5ecc122afb7f4a4b56d11778d2d2e0de78a7 +Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3 diff --git a/lib/closql b/lib/closql index 820e951..85ac7b8 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 820e95170acb79de0fb554577a0dc9b707e23aea +Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905 diff --git a/lib/compat b/lib/compat index 1573aa2..e3b9f66 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit 1573aa2e6d478c30cc7f394b72cbaa4db77ef811 +Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb diff --git a/lib/dash b/lib/dash index 3df46d7..96eaba0 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 3df46d7d9fe74f52a661565888e4d31fd760f0df +Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a diff --git a/lib/diff-hl b/lib/diff-hl index 68fb280..ac746a6 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 68fb280b300c5d8460cc7b9183e29fb3ec604136 +Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107 diff --git a/lib/emacsql b/lib/emacsql index 6b2e65b..6401226 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 6b2e65bdf785364cf7c34c31fea5812e1e58c657 +Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42 diff --git a/lib/epkg b/lib/epkg index cfdc4fc..a72903c 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit cfdc4fc3c63b663fd4c1643bd3b174cb4d79287c +Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09 diff --git a/lib/git-modes b/lib/git-modes index be96ef1..44d536b 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit be96ef14fab6a2d76cca3ebf9a15b462a695923d +Subproject commit 44d536ba637235c9dd203410281397417a3e60b6 diff --git a/lib/llama b/lib/llama index e919c6e..f4a59f2 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit e919c6e55c091c360d708295f9f832f896d3a457 +Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99 diff --git a/lib/magit b/lib/magit index 99d9b30..5389cbc 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 99d9b3008adf72a0c2cdb7df70b5ae03ea9271c8 +Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350 diff --git a/lib/transient b/lib/transient index c6cf2f2..6efa9fa 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit c6cf2f2705ab56cd89d807e723ce45b9fcdfb9e1 +Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba diff --git a/lib/use-package b/lib/use-package index bcf0984..a6e8564 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit bcf0984cf55b70fe6896c6a15f61df92b24f8ffd +Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c diff --git a/lib/with-editor b/lib/with-editor index 4da1097..bce8d1b 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 4da109748da0828b79198701eb641d5b724153ce +Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7