diff --git a/nvim/.config/nvim/after/plugin/comment.lua b/nvim/.config/nvim/after/plugin/comment.lua
new file mode 100644
index 0000000..2b118d9
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/comment.lua
@@ -0,0 +1,19 @@
+require('Comment').setup{
+  padding = true,
+  ignore  = nil,
+  mappings = {
+    basic    = true,
+    extra    = true,
+    extended = false,
+  },
+  toggler = {
+    line  = 'gcc',
+    block = 'gbc',
+  },
+  opleader = {
+    line  = 'gc',
+    block = 'gb',
+  },
+  pre_hook  = nil,
+  post_hook = nil,
+}
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 3afc7cc..828d3ae 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -57,9 +57,9 @@ local init = function ()
     'kana/vim-textobj-entire',
     'idbrii/textobj-word-column.vim',
   }
+  use 'numToStr/Comment.nvim'
   -- Tim pope essentials
   use {
-    'tpope/vim-commentary',
     'tpope/vim-repeat',
     'tpope/vim-sleuth'
   }