From ef4b36bd9d09e8f75dc328ec4f9757c16b4a447a Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Mon, 11 Mar 2024 10:05:31 -0400
Subject: [PATCH] Add commentstring stuff

---
 nix/home-manager/modules/packages/git.nix         | 7 ++++---
 nix/home-manager/modules/packages/neovim.nix      | 1 +
 nix/home-manager/modules/packages/neovim/core.lua | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nix/home-manager/modules/packages/git.nix b/nix/home-manager/modules/packages/git.nix
index 68c9f61..250703b 100644
--- a/nix/home-manager/modules/packages/git.nix
+++ b/nix/home-manager/modules/packages/git.nix
@@ -68,9 +68,10 @@
         conflictStyle = "zdiff3";
       };
 
-      pack = {
-        allowPackReuse = "multi";
-      };
+      # Commented out until git 2.44.0 makes its way to nixpkgs
+      # pack = {
+      #   allowPackReuse = "multi";
+      # };
 
       push = {
         autoSetupRemote = true;
diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix
index 1637093..01323bb 100644
--- a/nix/home-manager/modules/packages/neovim.nix
+++ b/nix/home-manager/modules/packages/neovim.nix
@@ -84,6 +84,7 @@
     extraPlugins =
       (
         with pkgs.vimPlugins; [
+          nvim-ts-context-commentstring
           telescope-zf-native-nvim
           vim-ReplaceWithRegister
           vim-bbye
diff --git a/nix/home-manager/modules/packages/neovim/core.lua b/nix/home-manager/modules/packages/neovim/core.lua
index 0da016c..2c60320 100644
--- a/nix/home-manager/modules/packages/neovim/core.lua
+++ b/nix/home-manager/modules/packages/neovim/core.lua
@@ -31,6 +31,7 @@ vim.o.title = true
 vim.o.updatetime = 500
 vim.o.wildmenu = true
 vim.o.wildmode = "list:longest,full"
+vim.g.skip_ts_context_commentstring_module = true
 
 vim.api.nvim_create_autocmd("TextYankPost", {
 	callback = function()