diff --git a/.borgconfig b/.borgconfig index d6cea4d..c309a99 100644 --- a/.borgconfig +++ b/.borgconfig @@ -2,8 +2,8 @@ no-byte-compile = dash-functional.el no-makeinfo = dash-template.texi [submodule "emacsql"] + no-byte-compile = emacsql-mysql.el no-byte-compile = emacsql-pg.el -[submodule "magit"] - no-byte-compile = lisp/magit-libgit.el -[submodule "sqlite3"] - build-step = make + no-byte-compile = emacsql-psql.el + no-byte-compile = emacsql-sqlite.el + no-byte-compile = emacsql-sqlite-module.el diff --git a/.gitmodules b/.gitmodules index 28d3812..3a22e70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,37 +3,37 @@ path = .borgconfig [submodule "auto-compile"] path = lib/auto-compile - url = git@github.com:emacscollective/auto-compile.git + url = https://github.com/emacscollective/auto-compile.git [submodule "borg"] path = lib/borg - url = git@github.com:emacscollective/borg.git + url = https://github.com/emacscollective/borg.git [submodule "closql"] path = lib/closql - url = git@github.com:magit/closql.git + url = https://github.com/magit/closql.git [submodule "compat"] path = lib/compat - url = https://git.sr.ht/~pkal/compat + url = https://github.com/emacs-compat/compat.git [submodule "dash"] path = lib/dash - url = git@github.com:magnars/dash.el.git + url = https://github.com/magnars/dash.el.git [submodule "diff-hl"] path = lib/diff-hl - url = git@github.com:dgutov/diff-hl.git + url = https://github.com/dgutov/diff-hl.git [submodule "emacsql"] path = lib/emacsql - url = git@github.com:magit/emacsql.git + url = https://github.com/magit/emacsql.git [submodule "epkg"] path = lib/epkg - url = git@github.com:emacscollective/epkg.git + url = https://github.com/emacscollective/epkg.git [submodule "git-modes"] path = lib/git-modes - url = git@github.com:magit/git-modes.git + url = https://github.com/magit/git-modes.git [submodule "llama"] path = lib/llama - url = https://git.sr.ht/~tarsius/llama + url = https://github.com/tarsius/llama.git [submodule "magit"] path = lib/magit - url = git@github.com:magit/magit.git + url = https://github.com/magit/magit.git [submodule "markdown-mode"] path = lib/markdown-mode url = git@github.com:jrblevin/markdown-mode.git @@ -43,25 +43,19 @@ [submodule "queue"] path = lib/queue url = git@github.com:emacsmirror/queue.git -[submodule "sqlite3"] - path = lib/sqlite3 - url = git@github.com:pekingduck/emacs-sqlite3-api.git [submodule "transient"] path = lib/transient - url = git@github.com:magit/transient.git + url = https://github.com/magit/transient.git [submodule "treepy"] path = lib/treepy - url = git@github.com:volrath/treepy.el.git + url = https://github.com/volrath/treepy.el.git [submodule "undo-tree"] remote = silent http://www.dr-qubit.org/git/undo-tree.git path = lib/undo-tree url = git@github.com:tarsiiformes/undo-tree.git -[submodule "use-package"] - path = lib/use-package - url = git@github.com:jwiegley/use-package.git [submodule "with-editor"] path = lib/with-editor - url = git@github.com:magit/with-editor.git + url = https://github.com/magit/with-editor.git [submodule "yaml-mode"] path = lib/yaml-mode url = git@github.com:yoshiki/yaml-mode.git diff --git a/early-init.el b/early-init.el index 72fa63c..200c2c4 100644 --- a/early-init.el +++ b/early-init.el @@ -7,10 +7,10 @@ (setq load-prefer-newer t) -(let ((dir (file-name-directory (or load-file-name buffer-file-name)))) - (add-to-list 'load-path (expand-file-name "lib/compat" dir)) - (add-to-list 'load-path (expand-file-name "lib/packed" dir)) - (add-to-list 'load-path (expand-file-name "lib/auto-compile" dir))) +(add-to-list 'load-path + (expand-file-name + "lib/auto-compile" + (file-name-directory (or load-file-name buffer-file-name)))) (require 'auto-compile) (auto-compile-on-load-mode) (auto-compile-on-save-mode) diff --git a/init.el b/init.el index 8ae2c5a..e234d6a 100644 --- a/init.el +++ b/init.el @@ -30,8 +30,11 @@ (borg-initialize)) (eval-and-compile ; `use-package' - (require 'use-package) - (setq use-package-verbose t)) + (setopt use-package-enable-imenu-support t) + (setopt use-package-verbose t) + (require 'use-package)) + +(use-package compat) (use-package dash :config (global-dash-fontify-mode)) @@ -64,7 +67,7 @@ (load custom-file))) (use-package server - :commands (server-running-p) + :functions (server-running-p) :config (or (server-running-p) (server-mode))) (progn ; startup diff --git a/lib/auto-compile b/lib/auto-compile index 36646df..5cc4e97 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404 +Subproject commit 5cc4e97443727554357f6c57614f12ca87419627 diff --git a/lib/borg b/lib/borg index f9b3413..7b88080 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3 +Subproject commit 7b88080eea47f6991e74df6e573d3fc88920ac59 diff --git a/lib/closql b/lib/closql index 85ac7b8..c1a346d 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905 +Subproject commit c1a346d56ecee16d1f0d7707f0d62c72604a8802 diff --git a/lib/compat b/lib/compat index e3b9f66..e9203e1 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb +Subproject commit e9203e164903a6bb7de3e58aa0d653bbcff9d3d1 diff --git a/lib/dash b/lib/dash index 96eaba0..1de9dcb 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a +Subproject commit 1de9dcb83eacfb162b6d9a118a4770b1281bcd84 diff --git a/lib/diff-hl b/lib/diff-hl index ac746a6..b80ff9b 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107 +Subproject commit b80ff9b4a772f7ea000e86fbf88175104ddf9557 diff --git a/lib/emacsql b/lib/emacsql index 6401226..e5f0928 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42 +Subproject commit e5f0928a047dba8e3a00b6333400422b301bac35 diff --git a/lib/epkg b/lib/epkg index a72903c..8f51609 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09 +Subproject commit 8f51609006a563222e64c3f61363061a8c2d7748 diff --git a/lib/git-modes b/lib/git-modes index 44d536b..f99010b 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 44d536ba637235c9dd203410281397417a3e60b6 +Subproject commit f99010bbeb8b6d8a0819fac0195a2ef0159d08f0 diff --git a/lib/llama b/lib/llama index f4a59f2..732389e 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99 +Subproject commit 732389e3886b510c2661d7d4fd65e01837211e8a diff --git a/lib/magit b/lib/magit index 5389cbc..461d5ba 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350 +Subproject commit 461d5ba249b8178ae83f80596da4312e65010720 diff --git a/lib/sqlite3 b/lib/sqlite3 deleted file mode 160000 index ad6dc36..0000000 --- a/lib/sqlite3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad6dc366b7cc7587965a7eeb7c1fb8b83679f81e diff --git a/lib/transient b/lib/transient index 6efa9fa..3ec0692 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba +Subproject commit 3ec0692c3122ab78e1967bbbfa377711a123abe6 diff --git a/lib/treepy b/lib/treepy index 7c4a0d2..75fe3ec 160000 --- a/lib/treepy +++ b/lib/treepy @@ -1 +1 @@ -Subproject commit 7c4a0d21322506a4d4b2301b4274ec955b429b47 +Subproject commit 75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e diff --git a/lib/use-package b/lib/use-package deleted file mode 160000 index a6e8564..0000000 --- a/lib/use-package +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c diff --git a/lib/with-editor b/lib/with-editor index bce8d1b..63e60d5 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7 +Subproject commit 63e60d5877c97b5c4205816ddd2ba53dde109317