diff --git a/roles/neovim/files/lua/plugins.lua b/roles/neovim/files/lua/plugins.lua
index 14a8842..6d53be0 100644
--- a/roles/neovim/files/lua/plugins.lua
+++ b/roles/neovim/files/lua/plugins.lua
@@ -48,4 +48,7 @@ return require('packer').startup(function()
 			"tpope/vim-repeat"
 		}
 	})
+
+	-- Commenting
+	use 'terrortylor/nvim-comment'
 end)
diff --git a/roles/neovim/files/plugin/comment.lua b/roles/neovim/files/plugin/comment.lua
new file mode 100644
index 0000000..f1783e6
--- /dev/null
+++ b/roles/neovim/files/plugin/comment.lua
@@ -0,0 +1 @@
+require('nvim_comment').setup({comment_empty = false})