[emacs] add borg-nix-shell and use it to build notmuch's build deps

[~bandali/configs] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index 6986302..e5a4bb5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [borg]
        pushDefault = aminb
        collective = emacsg
 [borg]
        pushDefault = aminb
        collective = emacsg

+[submodule "all-the-icons"]
+       path = lib/all-the-icons
+       url = git@github.com:domtronn/all-the-icons.el.git

 [submodule "alloy-mode"]
        path = lib/alloy-mode
        url = git@github.com:dwwmmn/alloy-mode.git
 [submodule "alloy-mode"]
        path = lib/alloy-mode
        url = git@github.com:dwwmmn/alloy-mode.git


@@ -13,12 +16,21 @@
 [submodule "borg"]
        path = lib/borg
        url = git@github.com:emacscollective/borg.git
 [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 "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
 [submodule "dante"]
        path = lib/dante
        url = git@github.com:jyp/dante.git


@@ -33,6 +45,16 @@
 [submodule "diff-hl"]
        path = lib/diff-hl
        url = git@github.com:dgutov/diff-hl.git
 [submodule "diff-hl"]
        path = lib/diff-hl
        url = git@github.com:dgutov/diff-hl.git

+[submodule "doom-modeline"]
+       path = lib/doom-modeline
+       url = git@github.com:seagle0128/doom-modeline.git
+[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

 [submodule "emacsql"]
        path = lib/emacsql
        url = git@github.com:skeeto/emacsql.git
 [submodule "emacsql"]
        path = lib/emacsql
        url = git@github.com:skeeto/emacsql.git


@@ -43,18 +65,9 @@
 [submodule "epl"]
        path = lib/epl
        url = git@github.com:cask/epl.git
 [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
 [submodule "exec-path-from-shell"]
        path = lib/exec-path-from-shell
        url = git@github.com:purcell/exec-path-from-shell.git

-[submodule "exwm"]
-       path = lib/exwm
-       url = git@github.com:ch11ng/exwm.git

 [submodule "f"]
        path = lib/f
        url = git@github.com:rejeep/f.el.git
 [submodule "f"]
        path = lib/f
        url = git@github.com:rejeep/f.el.git


@@ -82,9 +95,6 @@
 [submodule "hlint-refactor"]
        path = lib/hlint-refactor
        url = git@github.com:mpickering/hlint-refactor-mode.git
 [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
 [submodule "hydra"]
        path = lib/hydra
        url = git@github.com:abo-abo/hydra.git


@@ -109,6 +119,12 @@
 [submodule "markdown-mode"]
        path = lib/markdown-mode
        url = git@github.com:jrblevin/markdown-mode.git
 [submodule "markdown-mode"]
        path = lib/markdown-mode
        url = git@github.com:jrblevin/markdown-mode.git

+[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
 [submodule "no-littering"]
        path = lib/no-littering
        url = git@github.com:emacscollective/no-littering.git


@@ -117,10 +133,24 @@
        url = https://git.notmuchmail.org/git/notmuch
        load-path = emacs
        info-path = doc/_build/texinfo
        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
        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

 [submodule "packed"]
        path = lib/packed
        url = git@github.com:emacscollective/packed.git
 [submodule "packed"]
        path = lib/packed
        url = git@github.com:emacscollective/packed.git


@@ -130,12 +160,25 @@
 [submodule "popup"]
        path = lib/popup
        url = git@github.com:auto-complete/popup-el.git
 [submodule "popup"]
        path = lib/popup
        url = git@github.com:auto-complete/popup-el.git

+[submodule "projectile"]
+       path = lib/projectile
+       url = git@github.com:bbatsov/projectile.git
+[submodule "proof-site"]  # Proof General
+       path = lib/proof-site
+       url = git@github.com:ProofGeneral/PG.git

 [submodule "s"]
        path = lib/s
        url = git@github.com:magnars/s.el.git
 [submodule "s"]
        path = lib/s
        url = git@github.com:magnars/s.el.git

+[submodule "shrink-path"]
+       path = lib/shrink-path
+       url = git@gitlab.com:bennya/shrink-path.el.git

 [submodule "smex"]  # used by counsel-M-x
        path = lib/smex
        url = git@github.com:nonsequitur/smex.git
 [submodule "smex"]  # used by counsel-M-x
        path = lib/smex
        url = git@github.com:nonsequitur/smex.git

+[submodule "tao-theme"]
+       path = lib/tao-theme
+       url = git@github.com:11111000000/tao-theme-emacs.git
+       remote = aminb git@github.com:aminb/tao-theme-emacs.git

 [submodule "undo-tree"]
        path = lib/undo-tree
        url = git@github.com:emacsorphanage/undo-tree.git
 [submodule "undo-tree"]
        path = lib/undo-tree
        url = git@github.com:emacsorphanage/undo-tree.git


@@ -148,9 +191,6 @@
 [submodule "with-editor"]
        path = lib/with-editor
        url = git@github.com:magit/with-editor.git
 [submodule "with-editor"]
        path = lib/with-editor
        url = git@github.com:magit/with-editor.git

-[submodule "xelb"]
-       path = lib/xelb
-       url = git@github.com:ch11ng/xelb.git

 [submodule "yaml-mode"]
        path = lib/yaml-mode
        url = git@github.com:yoshiki/yaml-mode.git
 [submodule "yaml-mode"]
        path = lib/yaml-mode
        url = git@github.com:yoshiki/yaml-mode.git