diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix
index f11b9d1..cf9026b 100644
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 with builtins;
 {
@@ -115,22 +115,9 @@ with builtins;
       lazy = false;
     }
     {
-      plugin = nvim-treesitter;
+      plugin = nvim-treesitter.withAllGrammars;
       event = [ "BufReadPost" "BufNewFile" ];
-      conf =
-        let
-          parserDir = pkgs.symlinkJoin {
-            name = "tresitter-grammars-all";
-            paths = lib.attrValues (lib.filterAttrs (_: builtins.isAttrs) nvim-treesitter-parsers);
-          };
-        in
-        readFile ./nvim-treesitter.lua + ''
-          vim.opt.runtimepath:append("${parserDir}")
-
-          require'nvim-treesitter.configs'.setup {
-            parser_install_dir = "${parserDir}",
-          }
-        '';
+      conf = readFile ./nvim-treesitter.lua;
       dependencies = [
         { plugin = nvim-ts-context-commentstring; }
         {
@@ -202,7 +189,6 @@ with builtins;
     {
       plugin = telescope-fzf-native-nvim;
       conf = readFile ./telescope-fzf-native-nvim.lua;
-      cmd = [ "Telescope" ];
       keys = [
         { key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
         { key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
@@ -234,10 +220,5 @@ with builtins;
       cmd = [ "StartupTime" ];
       conf = readFile ./vim-startuptime.lua;
     }
-    {
-      plugin = comment-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = "require('Comment').setup()";
-    }
   ];
 }
diff --git a/modules/programs/nvim/plugins/mini-nvim.lua b/modules/programs/nvim/plugins/mini-nvim.lua
index 6ce1ecc..e2824f6 100644
--- a/modules/programs/nvim/plugins/mini-nvim.lua
+++ b/modules/programs/nvim/plugins/mini-nvim.lua
@@ -1,4 +1,11 @@
 require("mini.align").setup()
+require("mini.comment").setup({
+  options = {
+    custom_commentstring = function()
+      return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
+    end,
+  },
+})
 require("mini.surround").setup()
 require("mini.move").setup()
 require("mini.pairs").setup()