From 0db5dedf912ecb2249653b210769f067c338d128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 13 Jun 2026 23:26:37 -0300 Subject: [PATCH] kak-tree-sitter cleanup --- user/kakoune/kak-tree-sitter.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/user/kakoune/kak-tree-sitter.nix b/user/kakoune/kak-tree-sitter.nix index 59ab3e0..97191ce 100644 --- a/user/kakoune/kak-tree-sitter.nix +++ b/user/kakoune/kak-tree-sitter.nix @@ -1,8 +1,6 @@ { pkgs, lib, ... }: let - hx-src = pkgs.helix.src; kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src; - inherit (pkgs) fetchFromGitHub; in with pkgs.tree-sitter-grammars; { @@ -14,13 +12,6 @@ with pkgs.tree-sitter-grammars; + '' [language.${name}.grammar.source.local] path = "${vals.parser}" - [language.${name}.grammar] - compile = "cc" - compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] - compile_flags = ["-O3"] - link = "cc" - link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"] - link_flags = ["-O3"] [language.${name}.queries.source.local] path = "${vals.queries}" [language.${name}.queries] @@ -48,16 +39,7 @@ with pkgs.tree-sitter-grammars; queries = tree-sitter-javascript + "/queries"; }; typescript = { - parser = - tree-sitter-typescript.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "tree-sitter"; - repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; - }; - }) - + "/parser"; + parser = tree-sitter-typescript + "/parser"; queries = kts-src + "/runtime/queries/typescript"; }; };