diff --git a/home/vim/default.nix b/home/vim/default.nix
index cf7e35d..55a79df 100644
--- a/home/vim/default.nix
+++ b/home/vim/default.nix
@@ -66,6 +66,7 @@ in
       null-ls-nvim # LSP integration for linters and formatters
       (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) # Better highlighting
       nvim-treesitter-textobjects # More textobjects
+      nvim-ts-context-commentstring # Comment string in nested language blocks
       plenary-nvim # 'null-ls', 'telescope' dependency
 
       # Completion
diff --git a/home/vim/plugin/settings/tree-sitter.vim b/home/vim/plugin/settings/tree-sitter.vim
index ab38090..1204185 100644
--- a/home/vim/plugin/settings/tree-sitter.vim
+++ b/home/vim/plugin/settings/tree-sitter.vim
@@ -9,6 +9,9 @@ ts_config.setup({
     indent = {
         enable = true,
     },
+    context_commentstring = {
+        enable = true,
+    },
     textobjects = {
         select = {
             enable = true,