X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/fdcac86a345fe80043e56d5b8defd6b9fb744d22..f1e3161264dec7f2d12f0280a0b71d11e62cc5c4:/.gitmodules

diff --git a/.gitmodules b/.gitmodules
index 0a8d328..f9a2383 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,12 +16,21 @@
 [submodule "borg"]
 	path = lib/borg
 	url = git@github.com:emacscollective/borg.git
+[submodule "borg-nix-shell"]
+	path = lib/borg-nix-shell
+	url = git@github.com:thblt/borg-nix-shell.git
 [submodule "closql"]
 	path = lib/closql
 	url = git@github.com:emacscollective/closql.git
 [submodule "company"]
 	path = lib/company
 	url = git@github.com:company-mode/company-mode.git
+[submodule "counsel-notmuch"]
+	path = lib/counsel-notmuch
+	url = git@github.com:fuxialexander/counsel-notmuch.git
+[submodule "crux"]
+	path = lib/crux
+	url = git@github.com:bbatsov/crux.git
 [submodule "dante"]
 	path = lib/dante
 	url = git@github.com:jyp/dante.git
@@ -42,6 +51,7 @@
 [submodule "eink-theme"]
 	path = lib/eink-theme
 	url = git@github.com:maio/eink-emacs.git
+	remote = aminb git@github.com:aminb/eink-emacs.git
 [submodule "eldoc-eval"]
 	path = lib/eldoc-eval
 	url = git@github.com:thierryvolpiatto/eldoc-eval.git
@@ -55,12 +65,6 @@
 [submodule "epl"]
 	path = lib/epl
 	url = git@github.com:cask/epl.git
-[submodule "evil"]
-	path = lib/evil
-	url = git@github.com:emacs-evil/evil.git
-[submodule "evil-escape"]
-	path = lib/evil-escape
-	url = git@github.com:syl20bnr/evil-escape.git
 [submodule "exec-path-from-shell"]
 	path = lib/exec-path-from-shell
 	url = git@github.com:purcell/exec-path-from-shell.git
@@ -73,9 +77,6 @@
 [submodule "flycheck-haskell"]
 	path = lib/flycheck-haskell
 	url = git@github.com:flycheck/flycheck-haskell.git
-[submodule "general"]
-	path = lib/general
-	url = git@github.com:noctuid/general.el.git
 [submodule "ghub"]
 	path = lib/ghub
 	url = git@github.com:magit/ghub.git
@@ -91,9 +92,6 @@
 [submodule "hlint-refactor"]
 	path = lib/hlint-refactor
 	url = git@github.com:mpickering/hlint-refactor-mode.git
-[submodule "htmlize"]
-	path = lib/htmlize
-	url = git@github.com:hniksic/emacs-htmlize.git
 [submodule "hydra"]
 	path = lib/hydra
 	url = git@github.com:abo-abo/hydra.git
@@ -121,6 +119,9 @@
 [submodule "memoize"]
 	path = lib/memoize
 	url = git@github.com:skeeto/emacs-memoize.git
+[submodule "mwim"]
+	path = lib/mwim
+	url = git@github.com:alezost/mwim.el.git
 [submodule "no-littering"]
 	path = lib/no-littering
 	url = git@github.com:emacscollective/no-littering.git
@@ -129,10 +130,21 @@
 	url = https://git.notmuchmail.org/git/notmuch
 	load-path = emacs
 	info-path = doc/_build/texinfo
+	build-nix-shell-packages = pkgconfig gitMinimal xapian gmime talloc zlib pythonPackages.sphinx pythonPackages.python texinfo
 	build-step = ./configure
 	build-step = make
 	build-step = make sphinx-texinfo
 	build-step = borg-makeinfo
+[submodule "org"]
+	path = lib/org
+	url = git@code.orgmode.org:bzg/org-mode.git
+	load-path = lisp
+	info-path = doc
+	build-step = make compile autoloads info ORG_ADD_CONTRIB="org-notmuch"
+	# setting ORG_ADD_CONTRIB results in copying of files from contrib/
+	# into lisp/, which git will pick up.  so, let's ignore untracked files
+	# from org's submodule; at least for now
+	ignore = untracked
 [submodule "ox-hugo"]
 	path = lib/ox-hugo
 	url = git@github.com:kaushalmodi/ox-hugo.git