Use the default (block) cursor-type, combine two bind-keys calls

[~bandali/configs] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index bbf0f16..003c015 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,324 +1,58 @@
-[borg]
-       pushDefault = aminb
-       collective = emacsg
-[submodule "alert"]
-       path = lib/alert
-       url = git@github.com:jwiegley/alert.git
-[submodule "alloy-mode"]
-       path = lib/alloy-mode
-       url = git@github.com:dwwmmn/alloy-mode.git
-[submodule "anzu"]
-       path = lib/anzu
-       url = git@github.com:syohex/emacs-anzu.git
-[submodule "apiwrap"]
-       path = lib/apiwrap
-       url = git@github.com:vermiculus/apiwrap.el.git
+[submodule "amx"]
+       path = lib/amx
+       url = https://github.com/DarwinAwardWinner/amx.git

 [submodule "async"]
        path = lib/async
 [submodule "async"]
        path = lib/async

-       url = git@github.com:jwiegley/emacs-async.git
+       url = https://github.com/jwiegley/emacs-async.git

 [submodule "auto-compile"]
        path = lib/auto-compile
 [submodule "auto-compile"]
        path = lib/auto-compile

-       url = git@github.com:emacscollective/auto-compile.git
-[submodule "boogie-friends"]
-       path = lib/boogie-friends
-       url = git@github.com:boogie-org/boogie-friends.git
-       load-path = emacs
+       url = https://github.com/emacscollective/auto-compile.git

 [submodule "borg"]
        path = lib/borg
 [submodule "borg"]
        path = lib/borg

-       url = git@github.com:emacscollective/borg.git
-[submodule "boxquote"]
-       path = lib/boxquote
-       url = git@github.com:davep/boxquote.el.git
-[submodule "circe"]
-       path = lib/circe
-       url = git@github.com:jorgenschaefer/circe.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 "crux"]
-       path = lib/crux
-       url = git@github.com:bbatsov/crux.git
-[submodule "dante"]
-       path = lib/dante
-       url = git@github.com:jyp/dante.git
+       url = https://github.com/emacscollective/borg.git

 [submodule "dash"]
        path = lib/dash
 [submodule "dash"]
        path = lib/dash

-       url = git@github.com:magnars/dash.el.git
-       no-makeinfo = dash-template.texi
+       url = https://github.com/magnars/dash.el.git
+    no-makeinfo = dash-template.texi

        # dash creates a `dir' dash info file, which makes git think
        # that the submodule is dirty. so, let's ignore the untracked
        # files of dash's submodule
        ignore = untracked
        # dash creates a `dir' dash info file, which makes git think
        # that the submodule is dirty. so, let's ignore the untracked
        # files of dash's submodule
        ignore = untracked

-[submodule "deferred"]
-       path = lib/deferred
-       url = git@github.com:kiwanami/emacs-deferred.git
-[submodule "diff-hl"]
-       path = lib/diff-hl
-       url = git@github.com:dgutov/diff-hl.git
-[submodule "ebdb"]
-       path = lib/ebdb
-       url = git@github.com:emacsmirror/ebdb.git
-[submodule "edit-indirect"]
-       path = lib/edit-indirect
-       url = git@github.com:Fanael/edit-indirect.git
-[submodule "eldoc-eval"]
-       path = lib/eldoc-eval
-       url = git@github.com:thierryvolpiatto/eldoc-eval.git
-[submodule "elisp-refs"]
-       path = lib/elisp-refs
-       url = git@github.com:Wilfred/elisp-refs.git
-[submodule "emacsql"]
-       path = lib/emacsql
-       url = git@github.com:skeeto/emacsql.git
-       no-byte-compile = emacsql-pg.el
-[submodule "emmet-mode"]
-       path = lib/emmet-mode
-       url = git@github.com:smihica/emmet-mode.git
-[submodule "emojify"]
-       path = lib/emojify
-       url = git@github.com:iqbalansari/emacs-emojify.git
-[submodule "epkg"]
-       path = lib/epkg
-       url = git@github.com:emacscollective/epkg.git
-[submodule "epl"]
-       path = lib/epl
-       url = git@github.com:cask/epl.git
-[submodule "eshell-up"]
-       path = lib/eshell-up
-       url = git@github.com:peterwvj/eshell-up.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 "evil-nerd-commenter"]
-       path = lib/evil-nerd-commenter
-       url = git@github.com:redguardtoo/evil-nerd-commenter.git
-[submodule "evil-surround"]
-       path = lib/evil-surround
-       url = git@github.com:emacs-evil/evil-surround.git
-[submodule "exec-path-from-shell"]
-       path = lib/exec-path-from-shell
-       url = git@github.com:purcell/exec-path-from-shell.git
-[submodule "f"]
-       path = lib/f
-       url = git@github.com:rejeep/f.el.git
-[submodule "flycheck"]
-       path = lib/flycheck
-       url = git@github.com:flycheck/flycheck.git
-[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
-[submodule "ghub+"]
-       path = lib/ghub+
-       url = git@github.com:vermiculus/ghub-plus.git
-       remote = aminb git@github.com:aminb/ghub-plus.git
-[submodule "git-modes"]
-       path = lib/git-modes
-       url = git@github.com:magit/git-modes.git
-[submodule "graphql"]
-       path = lib/graphql
-       url = git@github.com:vermiculus/graphql.el.git
-[submodule "haskell-mode"]
-       path = lib/haskell-mode
-       url = git@github.com:haskell/haskell-mode.git
-[submodule "helm"]
-       path = lib/helm
-       url = git@github.com:emacs-helm/helm.git
-[submodule "helpful"]
-       path = lib/helpful
-       url = git@github.com:Wilfred/helpful.git
-[submodule "hl-todo"]
-       path = lib/hl-todo
-       url = git@github.com:tarsius/hl-todo.git
-[submodule "hlint-refactor"]
-       path = lib/hlint-refactor
-       url = git@github.com:mpickering/hlint-refactor-mode.git
-[submodule "ht"]
-       path = lib/ht
-       url = git@github.com:Wilfred/ht.el.git
-[submodule "hydra"]
-       path = lib/hydra
-       url = git@github.com:abo-abo/hydra.git

 [submodule "ivy"]
        path = lib/ivy
 [submodule "ivy"]
        path = lib/ivy

-       url = git@github.com:abo-abo/swiper.git
-       info-path = doc
-[submodule "json-mode"]
-       path = lib/json-mode
-       url = git@github.com:joshwnj/json-mode.git
-[submodule "json-reformat"]
-       path = lib/json-reformat
-       url = git@github.com:gongo/json-reformat.git
-[submodule "json-snatcher"]
-       path = lib/json-snatcher
-       url = git@github.com:Sterlingg/json-snatcher.git
-[submodule "lcr"]
-       path = lib/lcr
-       url = git@github.com:jyp/lcr.git
-[submodule "lean-mode"]
-       path = lib/lean-mode
-       url = git@github.com:leanprover/lean-mode.git
-[submodule "loop"]
-       path = lib/loop
-       url = git@github.com:Wilfred/loop.el.git
+       url = https://github.com/abo-abo/swiper.git
+    info-path = doc
+[submodule "libgit"]
+       path = lib/libgit
+       url = https://github.com/magit/libegit2.git
+    build-step = make

 [submodule "magit"]
        path = lib/magit
 [submodule "magit"]
        path = lib/magit

-       url = git@github.com:magit/magit.git
-       recursive-byte-compile = true
+       url = https://github.com/magit/magit.git
+    recursive-byte-compile = true

        info-path = Documentation
        info-path = Documentation

-[submodule "magit-popup"]
-       path = lib/magit-popup
-       url = git@github.com:magit/magit-popup.git
-[submodule "magithub"]
-       path = lib/magithub
-       url = git@github.com:vermiculus/magithub.git
-       # magithub creates a `dir' info-related file, which makes git
-       # think the submodule is dirty. so, let's ignore the untracked
-       # files of this submodule
-       ignore = untracked
-[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 "mmm-mode"]
-       path = lib/mmm-mode
-       url = git@github.com:purcell/mmm-mode.git
-       # mmm-mode creates a `dir' info-related file, which makes git
-       # think the submodule is dirty. so, let's ignore the untracked
-       # files of this submodule
-       ignore = untracked
-[submodule "mwim"]
-       path = lib/mwim
-       url = git@github.com:alezost/mwim.el.git
-[submodule "nix-mode"]
-       path = lib/nix-mode
-       url = git@github.com:NixOS/nix-mode.git

 [submodule "no-littering"]
        path = lib/no-littering
 [submodule "no-littering"]
        path = lib/no-littering

-       url = git@github.com:emacscollective/no-littering.git
-[submodule "oauth2"]
-       path = lib/oauth2
-       url = git@github.com:emacsmirror/oauth2.git
+       url = https://github.com/emacscollective/no-littering.git

 [submodule "org"]
        path = lib/org
 [submodule "org"]
        path = lib/org

-       url = git@code.orgmode.org:bzg/org-mode.git
+       url = https://code.orgmode.org/bzg/org-mode.git
+    build-step = make

        load-path = lisp
        load-path = lisp

+       load-path = contrib/lisp

        info-path = doc
        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 "orgalist"]
-       path = lib/orgalist
-       url = git@github.com:emacsmirror/orgalist.git
-[submodule "other-frame-window"]
-       path = lib/other-frame-window
-       url = git@github.com:emacsmirror/other-frame-window.git
-[submodule "ox-hugo"]
-       path = lib/ox-hugo
-       url = git@github.com:kaushalmodi/ox-hugo.git

 [submodule "packed"]
        path = lib/packed
 [submodule "packed"]
        path = lib/packed

-       url = git@github.com:emacscollective/packed.git
-[submodule "pdf-tools"]
-       path = lib/pdf-tools
-       url = git@github.com:politza/pdf-tools.git
-       build-step = make
-       build-step = borg-byte-compile
-       build-step = borg-update-autoloads
-       # pdf-tools-install creates `lisp/epdfinfo', which makes git think
-       # that the submodule is dirty. so, let's ignore the untracked
-       # files of pdf-tools' submodule
-       ignore = untracked
-[submodule "pkg-info"]
-       path = lib/pkg-info
-       url = git@github.com:lunaryorn/pkg-info.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 "request"]
-       path = lib/request
-       url = git@github.com:tkf/emacs-request.git
-[submodule "rich-minority"]
-       path = lib/rich-minority
-       url = git@github.com:Malabarba/rich-minority.git
+       url = https://github.com/emacscollective/packed.git

 [submodule "s"]
        path = lib/s
 [submodule "s"]
        path = lib/s

-       url = git@github.com:magnars/s.el.git
-[submodule "shell-toggle"]
-       path = lib/shell-toggle
-       url = git@github.com:knu/shell-toggle.el.git
-[submodule "shrink-path"]
-       path = lib/shrink-path
-       url = git@gitlab.com:bennya/shrink-path.el.git
-[submodule "shut-up"]
-       path = lib/shut-up
-       url = git@github.com:cask/shut-up.git
-[submodule "slack"]
-       path = lib/slack
-       url = git@github.com:yuya373/emacs-slack.git
-[submodule "smart-mode-line"]
-       path = lib/smart-mode-line
-       url = git@github.com:Malabarba/smart-mode-line.git
-[submodule "smex"]  # used by counsel-M-x
-       path = lib/smex
-       url = git@github.com:nonsequitur/smex.git
-[submodule "tablist"]
-       path = lib/tablist
-       url = git@github.com:politza/tablist.git
-[submodule "treepy"]
-       path = lib/treepy
-       url = git@github.com:volrath/treepy.el.git
-[submodule "typo"]
-       path = lib/typo
-       url = git@github.com:jorgenschaefer/typoel.git
-[submodule "undo-tree"]
-       path = lib/undo-tree
-       url = git@github.com:emacsorphanage/undo-tree.git
-[submodule "unkillable-scratch"]
-       path = lib/unkillable-scratch
-       url = git@github.com:EricCrosson/unkillable-scratch.git
+       url = https://github.com/magnars/s.el.git
+[submodule "transient"]
+       path = lib/transient
+       url = https://github.com/magit/transient.git

 [submodule "use-package"]
        path = lib/use-package
 [submodule "use-package"]
        path = lib/use-package

-       url = git@github.com:jwiegley/use-package.git
-[submodule "web-mode"]
-       path = lib/web-mode
-       url = git@github.com:fxbois/web-mode.git
-[submodule "websocket"]
-       path = lib/websocket
-       url = git@github.com:ahyatt/emacs-websocket.git
-[submodule "which-key"]
-       path = lib/which-key
-       url = git@github.com:justbur/emacs-which-key.git
-[submodule "winum"]
-       path = lib/winum
-       url = git@github.com:deb0ch/emacs-winum.git
+       url = https://github.com/jwiegley/use-package.git

 [submodule "with-editor"]
        path = lib/with-editor
 [submodule "with-editor"]
        path = lib/with-editor

-       url = git@github.com:magit/with-editor.git
-[submodule "yaml-mode"]
-       path = lib/yaml-mode
-       url = git@github.com:yoshiki/yaml-mode.git
-[submodule "yasnippet"]
-       path = lib/yasnippet
-       url = git@github.com:joaotavora/yasnippet.git
+       url = https://github.com/magit/with-editor.git