diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index 729b275..ba3e16d 100644
--- a/home/editors/neovim/default.nix
+++ b/home/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   vimLua = lua: ''
@@ -28,7 +28,7 @@ in {
       auto-session
       vim-visual-multi
       vim-surround
-      kommentary
+      comment-nvim
       lightspeed-nvim
       which-key-nvim
       neogit
diff --git a/home/editors/neovim/init.lua b/home/editors/neovim/init.lua
index f04f334..3f5a375 100644
--- a/home/editors/neovim/init.lua
+++ b/home/editors/neovim/init.lua
@@ -31,6 +31,8 @@ vim.g.closetag_regions = {
   ["javascript.jsx"] = "jsxRegion",
 }
 
+require("Comment").setup {}
+
 local wk = require("which-key")
 
 require("nvim-tree").setup {}
diff --git a/home/editors/neovim/treesitter.lua b/home/editors/neovim/treesitter.lua
index 49602ac..457d2ea 100644
--- a/home/editors/neovim/treesitter.lua
+++ b/home/editors/neovim/treesitter.lua
@@ -1,8 +1,8 @@
-require'nvim-treesitter.configs'.setup {
+require("nvim-treesitter.configs").setup {
   highlight = {
     enable = true,
-    disable = {"org"},
-    additional_vim_regex_highlighting = {"org"},
+    disable = { "org" },
+    additional_vim_regex_highlighting = { "org" },
   },
   indent = {
     enable = true,
@@ -10,9 +10,6 @@ require'nvim-treesitter.configs'.setup {
   autotag = {
     enable = true,
   },
-  context_commentstring = {
-    enable = true,
-  },
   refactor = {
     highlight_definitions = { enable = true },
     highlight_current_scope = { enable = true },
@@ -84,3 +81,9 @@ require'nvim-treesitter.configs'.setup {
     },
   },
 }
+
+vim.g.skip_ts_context_commentstring_module = true
+
+require("ts_context_commentstring").setup {
+  enable_autocmd = false,
+}