From 945bd13e4f69fd7f7e7188aca2de4de15fb25e18 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 18 Apr 2024 10:48:15 -0400
Subject: [PATCH] feat: Replace vim-nix-rummik with treesitter (again)

The latest treesitter changes actually make using it better than the old
vim-nix-rummik solution. Syntax highlighting works quite well for the
/* lang */ code blocks.
---
 home/neovim.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/home/neovim.nix b/home/neovim.nix
index 5c128876..a61ba712 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -1,21 +1,7 @@
 { pkgs, config, ... }:
 
 let
-  inherit (pkgs) fetchFromGitHub vimPlugins;
-  inherit (pkgs.vimUtils) buildVimPlugin;
   inherit (config.lib.stylix.scheme) slug;
-
-  vim-nix-rummik = buildVimPlugin {
-    pname = "vim-nix-rummik";
-    version = "2022-11-16";
-
-    src = fetchFromGitHub {
-      owner = "rummik";
-      repo = "vim-nix";
-      rev = "0def8020f152a51c011a707680780dac61a8989a";
-      hash = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E=";
-    };
-  };
 in
 {
   programs.bat.enable = true;
@@ -175,7 +161,7 @@ in
       autocmd BufNewFile,BufRead *.mdx set filetype=markdown
     '';
 
-    plugins = with vimPlugins; [
+    plugins = with pkgs.vimPlugins; [
       {
         plugin = nvim-tree-lua;
         type = "lua";
@@ -532,7 +518,7 @@ in
             highlight = {
               enable = true,
               disable = function(lang)
-                if lang ~= "javascript" and lang ~= "tsx" and lang ~= "typescript" and lang ~= "astro" and lang ~= "css" and lang ~= "glsl" then
+                if lang ~= "javascript" and lang ~= "tsx" and lang ~= "typescript" and lang ~= "astro" and lang ~= "css" and lang ~= "glsl" and lang ~= "nix" then
                   return true
                 end
               end,
@@ -567,7 +553,7 @@ in
       neoformat
       bufdelete-nvim
       vim-crystal
-      vim-nix-rummik
+      vim-nix
       fcitx-vim
       typst-vim
       emmet-vim