summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules28
-rw-r--r--init.org32
m---------lib/anzu0
m---------lib/apiwrap0
m---------lib/general0
m---------lib/json-mode0
m---------lib/json-reformat0
m---------lib/json-snatcher0
m---------lib/mmm-mode0
m---------lib/nix-mode0
10 files changed, 7 insertions, 53 deletions
diff --git a/.gitmodules b/.gitmodules
index 4617b94..38f657d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,12 +10,6 @@
[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 "async"]
path = lib/async
url = git@github.com:jwiegley/emacs-async.git
@@ -95,9 +89,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
@@ -132,15 +123,6 @@
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
@@ -164,22 +146,12 @@
[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 "multi-term"]
path = lib/multi-term
url = git@github.com:emacsorphanage/multi-term.git
[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
url = git@github.com:emacscollective/no-littering.git
diff --git a/init.org b/init.org
index ae1a6e6..b144736 100644
--- a/init.org
+++ b/init.org
@@ -1472,19 +1472,11 @@ instead.
:hook (web-mode css-mode html-mode sgml-mode))
#+end_src
-** Nix
-
-#+begin_src emacs-lisp
-(use-package nix-mode
- :defer t
- :mode "\\.nix\\'")
-#+end_src
-
-** Java
+** COMMENT Java
*** meghanada
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
(use-package meghanada
:bind
(:map meghanada-mode-map
@@ -1511,7 +1503,7 @@ tree-mode
treemacs
#+end_comment
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
(use-package treemacs
:config (setq treemacs-never-persist t))
@@ -1776,11 +1768,10 @@ Make =*scratch*= and =*Messages*= unkillable.
Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
-** [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
+** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
#+begin_src emacs-lisp
(use-package highlight-indent-guides
- :disabled t
:defer 3
:hook ((prog-mode . highlight-indent-guides-mode)
;; (org-mode . highlight-indent-guides-mode)
@@ -1813,12 +1804,6 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
("l" . image-forward-hscroll)))
#+end_src
-** anzu
-
-#+begin_src emacs-lisp
-(use-package anzu)
-#+end_src
-
** typo.el
#+begin_src emacs-lisp
@@ -1869,13 +1854,12 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
""))))
#+end_src
-** slack
+** COMMENT slack
Hopefully temporary.
#+begin_src emacs-lisp
(use-package slack
- :disabled t
:commands (slack-start)
:init
(eval-when-compile ; silence the byte-compiler
@@ -2221,11 +2205,10 @@ I tried using =borg-elpa= instead of doing it like this, but it added
(bbdb-initialize 'gnus 'message))
#+end_src
-** message-x
+** COMMENT message-x
#+begin_src emacs-lisp
(use-package message-x
- :disabled t
:custom
(message-x-completion-alist
(quote
@@ -2237,11 +2220,10 @@ I tried using =borg-elpa= instead of doing it like this, but it added
. message-expand-group)))))
#+end_src
-** gnus-harvest
+** COMMENT gnus-harvest
#+begin_src emacs-lisp
(use-package gnus-harvest
- :disabled t
:commands gnus-harvest-install
:demand t
:config
diff --git a/lib/anzu b/lib/anzu
deleted file mode 160000
-Subproject e6c56ca8b23ac433f7be58b6f3f50801dd4164e
diff --git a/lib/apiwrap b/lib/apiwrap
deleted file mode 160000
-Subproject e4c9c57d6620a788ec8a715ff1bb50542edea3a
diff --git a/lib/general b/lib/general
deleted file mode 160000
-Subproject f48c43c4449677fa629aac2693ffcb850ca58c8
diff --git a/lib/json-mode b/lib/json-mode
deleted file mode 160000
-Subproject ffc92b1eefc54963703b43be140f4c8c8ad348f
diff --git a/lib/json-reformat b/lib/json-reformat
deleted file mode 160000
-Subproject 8eb6668ed447988aea06467ba8f42e1f2178246
diff --git a/lib/json-snatcher b/lib/json-snatcher
deleted file mode 160000
-Subproject c4cecc0a5051bd364373aa499c47a1bb7a5ac51
diff --git a/lib/mmm-mode b/lib/mmm-mode
deleted file mode 160000
-Subproject ff0b214f27d5dddeb856acb4216e77a864dcc0b
diff --git a/lib/nix-mode b/lib/nix-mode
deleted file mode 160000
-Subproject 1512d02830fe90dddd35c9b4bd83d0ee963de57