From: Amin Bandali <amin@gnu.org>
Date: Tue, 25 Sep 2018 00:45:42 +0000 (-0400)
Subject: [emacs] assimilate 6 drones (nix-mode and its deps)
X-Git-Url: https://git.shemshak.org/~bandali/configs/commitdiff_plain/1c3eaf158b5d2ee05afe4afd67746afbf9ed4c06?ds=inline

[emacs] assimilate 6 drones (nix-mode and its deps)
---

diff --git a/.gitmodules b/.gitmodules
index 16a0331..6dbc68b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -51,6 +51,9 @@
 [submodule "doom-modeline"]
 	path = lib/doom-modeline
 	url = git@github.com:seagle0128/doom-modeline.git
+[submodule "edit-indirect"]
+	path = lib/edit-indirect
+	url = git@github.com:Fanael/edit-indirect.git
 [submodule "eink-theme"]
 	path = lib/eink-theme
 	url = git@github.com:maio/eink-emacs.git
@@ -117,6 +120,15 @@
 	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
@@ -140,9 +152,19 @@
 [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' 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 "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 bbdc7f5..820714c 100644
--- a/init.org
+++ b/init.org
@@ -1286,6 +1286,13 @@ instead.
   :hook (web-mode css-mode html-mode sgml-mode))
 #+end_src
 
+** Nix
+
+#+begin_src emacs-lisp
+(use-package nix-mode
+  :mode "\\.nix\\'")
+#+end_src
+
 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
diff --git a/lib/edit-indirect b/lib/edit-indirect
new file mode 160000
index 0000000..de645d8
--- /dev/null
+++ b/lib/edit-indirect
@@ -0,0 +1 @@
+Subproject commit de645d8144e8a08f039a9c88185121ec81d957ef
diff --git a/lib/json-mode b/lib/json-mode
new file mode 160000
index 0000000..ffc92b1
--- /dev/null
+++ b/lib/json-mode
@@ -0,0 +1 @@
+Subproject commit ffc92b1eefc54963703b43be140f4c8c8ad348f7
diff --git a/lib/json-reformat b/lib/json-reformat
new file mode 160000
index 0000000..8eb6668
--- /dev/null
+++ b/lib/json-reformat
@@ -0,0 +1 @@
+Subproject commit 8eb6668ed447988aea06467ba8f42e1f2178246f
diff --git a/lib/json-snatcher b/lib/json-snatcher
new file mode 160000
index 0000000..c4cecc0
--- /dev/null
+++ b/lib/json-snatcher
@@ -0,0 +1 @@
+Subproject commit c4cecc0a5051bd364373aa499c47a1bb7a5ac51c
diff --git a/lib/mmm-mode b/lib/mmm-mode
new file mode 160000
index 0000000..ff0b214
--- /dev/null
+++ b/lib/mmm-mode
@@ -0,0 +1 @@
+Subproject commit ff0b214f27d5dddeb856acb4216e77a864dcc0b2
diff --git a/lib/nix-mode b/lib/nix-mode
new file mode 160000
index 0000000..fde8c8e
--- /dev/null
+++ b/lib/nix-mode
@@ -0,0 +1 @@
+Subproject commit fde8c8e38c9f94518661b31eb24a535c93306868