diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 98dd3e71b..fc54067f6 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -107,7 +107,7 @@
       :n  "gp"    #'+evil/reselect-paste
       :v  "gp"    #'+evil/paste-preserve-register
       :nv "g@"    #'+evil:apply-macro
-      :nv "gc"    #'evil-commentary
+      :nv "gc"    #'evilnc-comment-operator
       :nv "gx"    #'evil-exchange
       :nv "gy"    #'+evil:yank-unindented
       :n  "g="    #'evil-numbers/inc-at-pt
@@ -179,6 +179,7 @@
       :textobj "x" #'evil-inner-xml-attr               #'evil-outer-xml-attr
       :textobj "a" #'evil-inner-arg                    #'evil-outer-arg
       :textobj "B" #'evil-textobj-anyblock-inner-block #'evil-textobj-anyblock-a-block
+      :textobj "c" #'evilnc-inner-comment              #'evilnc-outer-commenter
       :textobj "i" #'evil-indent-plus-i-indent         #'evil-indent-plus-a-indent
       :textobj "k" #'evil-indent-plus-i-indent-up      #'evil-indent-plus-a-indent-up
       :textobj "j" #'evil-indent-plus-i-indent-up-down #'evil-indent-plus-a-indent-up-down
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 0e5a1b068..aee5cb16d 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -255,9 +255,8 @@
         "s--" #'doom/decrease-font-size
         ;; Conventional text-editing keys & motions
         "s-a" #'mark-whole-buffer
-        :g "s-/" (λ! (save-excursion (comment-line 1)))
-        :n "s-/" #'evil-commentary-line
-        :v "s-/" #'evil-commentary
+        :gn "s-/" #'evilnc-comment-or-uncomment-lines
+        :v  "s-/" #'evilnc-comment-operator
         :gi  [s-backspace] #'doom/backward-kill-to-bol-and-indent
         :gi  [s-left]      #'doom/backward-to-bol-or-indent
         :gi  [s-right]     #'doom/forward-to-last-non-comment-or-eol
diff --git a/modules/editor/evil/README.org b/modules/editor/evil/README.org
index 393de39e9..9832f20fb 100644
--- a/modules/editor/evil/README.org
+++ b/modules/editor/evil/README.org
@@ -27,12 +27,12 @@ This holy module brings the vim experience to Emacs.
 ** Plugins
 + [[https://github.com/emacs-evil/evil][evil]]
 + [[https://github.com/wcsmith/evil-args][evil-args]]
-+ [[https://github.com/linktohack/evil-commentary][evil-commentary]]
 + [[https://github.com/PythonNut/evil-easymotion][evil-easymotion]]
 + [[https://github.com/cute-jumper/evil-embrace.el][evil-embrace]]
 + [[https://github.com/syl20bnr/evil-escape][evil-escape]]
 + [[https://github.com/Dewdrops/evil-exchange][evil-exchange]]
 + [[https://github.com/TheBB/evil-indent-plus][evil-indent-plus]]
++ [[https://github.com/redguardtoo/evil-nerd-commenter][evil-nerd-commentary]]
 + [[https://github.com/redguardtoo/evil-matchit][evil-matchit]]
 + [[https://github.com/cofi/evil-numbers][evil-numbers]]
 + [[https://github.com/noctuid/evil-textobj-anyblock][evil-textobj-anyblock]]
@@ -64,7 +64,7 @@ The following vim plugins have been ported to evil:
 
 | Vim Plugin            | Emacs Plugin                   | Keybind(s)                           |
 |-----------------------+--------------------------------+--------------------------------------|
-| vim-commentary        | evil-commentary                | omap =gc=                            |
+| vim-commentary        | evil-nerd-commenter            | omap =gc=                            |
 | vim-easymotion        | evil-easymotion                | omap =gs=                            |
 | vim-seek or vim-sneak | evil-snipe                     | mmap =s=/=S=, omap =z=/=Z= & =x=/=x= |
 | vim-surround          | evil-embrace and evil-surround | vmap =S=, omap =ys=                  |
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 4a7f417f6..b9525bf03 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -183,15 +183,7 @@ directives. By default, this only recognizes C directives.")
 
 
 ;;
-;; Packages
-
-(use-package! evil-commentary
-  :commands (evil-commentary
-             evil-commentary-yank
-             evil-commentary-yank-line
-             evil-commentary-line)
-  :config (evil-commentary-mode 1))
-
+;;; Packages
 
 (use-package! evil-easymotion
   :commands evilem-create evilem-default-keybindings
@@ -281,6 +273,12 @@ directives. By default, this only recognizes C directives.")
         t))))
 
 
+(use-package! evil-nerd-commenter
+  :commands (evilnc-comment-operator
+             evilnc-inner-comment
+             evilnc-outer-commenter))
+
+
 (use-package! evil-snipe
   :commands (evil-snipe-mode
              evil-snipe-override-mode
diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el
index aed8f38bc..7e08dfe70 100644
--- a/modules/editor/evil/packages.el
+++ b/modules/editor/evil/packages.el
@@ -3,12 +3,12 @@
 
 (package! evil)
 (package! evil-args)
-(package! evil-commentary)
 (package! evil-easymotion)
 (package! evil-embrace)
 (package! evil-escape)
 (package! evil-exchange)
 (package! evil-indent-plus)
+(package! evil-nerd-commenter)
 (package! evil-numbers :recipe (:host github :repo "janpath/evil-numbers"))
 (package! evil-snipe)
 (package! evil-surround)