From 7e18e28d4aa007047656a6f95fef36b23141f209 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 18 Nov 2018 11:08:08 -0500
Subject: [PATCH] [emacs] add evil-{nerd-commenter,surround}

---
 .gitmodules             |  6 ++++++
 init.org                | 21 +++++++++++++++++++++
 lib/evil-nerd-commenter |  1 +
 lib/evil-surround       |  1 +
 4 files changed, 29 insertions(+)
 create mode 160000 lib/evil-nerd-commenter
 create mode 160000 lib/evil-surround

diff --git a/.gitmodules b/.gitmodules
index 515dd81..21d05de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -94,6 +94,12 @@
 [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
diff --git a/init.org b/init.org
index ed8bddb..0f1e578 100644
--- a/init.org
+++ b/init.org
@@ -751,6 +751,27 @@ customizing it.
   (push #'minibufferp evil-escape-inhibit-functions))
 #+end_src
 
+#+begin_src emacs-lisp
+(use-package evil-nerd-commenter
+  :after evil
+  :general
+  (nmap
+    "gc" 'evilnc-comment-operator
+    "gy" 'evilnc-copy-and-comment-lines))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package evil-surround
+  :after evil
+  :general
+  (omap
+    "s" 'evil-surround-edit
+    "S" 'evil-Surround-edit)
+  (vmap
+    "S" 'evil-surround-region
+    "gS" 'evil-Surround-region))
+#+end_src
+
 #+begin_src emacs-lisp
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")
diff --git a/lib/evil-nerd-commenter b/lib/evil-nerd-commenter
new file mode 160000
index 0000000..275c95c
--- /dev/null
+++ b/lib/evil-nerd-commenter
@@ -0,0 +1 @@
+Subproject commit 275c95c89cc09c7096bd6fd0deabd49f29634f5d
diff --git a/lib/evil-surround b/lib/evil-surround
new file mode 160000
index 0000000..63ce018
--- /dev/null
+++ b/lib/evil-surround
@@ -0,0 +1 @@
+Subproject commit 63ce01848878ce011eb4fee59c51109dd1e3ddb5
-- 
2.20.1