diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d2619af..6627c39 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,12 +9,6 @@ jobs: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - uses: DeterminateSystems/flakehub-cache-action@main - - uses: cachix/cachix-action@master - if: github.ref == 'refs/heads/master' - with: - name: nvim-treesitter-main - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix flake check - run: nix run nixpkgs#nixfmt **/*.nix diff --git a/README.md b/README.md index d948e4b..88bf18a 100644 --- a/README.md +++ b/README.md @@ -69,24 +69,6 @@ overlays = [ If you need the unpatched `nvim-treesitter` plugin without any parsers/queries bundled, even after you overlay it, you can use the `nvim-treesitter-unwrapped` output of this overlay. -## Cache - -Add our `cachix` repo to avoid needing to build grammars locally. - -```nix - nix = { - settings = { - substituters = [ - "https://nvim-treesitter-main.cachix.org" - ]; - trusted-public-keys = [ - "nvim-treesitter-main.cachix.org-1:cbwE6blfW5+BkXXyeAXoVSu1gliqPLHo2m98E4hWfZQ=" - ]; - }; - }; -``` - - ## Updating To update the list of parsers in `generated.nix`: diff --git a/flake.lock b/flake.lock index d77c843..cc085bb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1761385693, - "narHash": "sha256-/SGikTPEMxI7rcfGvuJlNZs73/wZiQx14QX9xlfsTv0=", + "lastModified": 1760866486, + "narHash": "sha256-ZeNCXy6+I18N+Nu2sKnEk2otVEb8V3tKhL8Jq95wS5k=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "98fe644cb3b5ba390d1bc3f89299f93c70020803", + "rev": "71bf1665f804d46f7e4b24ad7ffc11f6ea5b271a", "type": "github" }, "original": { diff --git a/generated.nix b/generated.nix index 18bb644..9f3053f 100644 --- a/generated.nix +++ b/generated.nix @@ -269,12 +269,12 @@ c3 = buildGrammar { passthru.name = "c3"; language = "c3"; - version = "0.0.0+rev=e4570693b8064a83cd7826795d5ef29400313d3c"; + version = "0.0.0+rev=057a75df0c866034d8edce989f701ee2cb0481d8"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "e4570693b8064a83cd7826795d5ef29400313d3c"; - hash = "sha256-gzlLKP/BE5sNM8tJ7ObKQNvd36CqWipFWhMkb4XqjjU="; + rev = "057a75df0c866034d8edce989f701ee2cb0481d8"; + hash = "sha256-MeeyiX9ZozGDbTNbO/Tvs97tQyzic5pu2sIPgXow2ok="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; @@ -537,12 +537,12 @@ desktop = buildGrammar { passthru.name = "desktop"; language = "desktop"; - version = "0.0.0+rev=773d164f6f3abd9cee37be17246bcae78b2ebcbc"; + version = "0.0.0+rev=de6482e226443a210f27627e0240c12aa25c2925"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-desktop"; - rev = "773d164f6f3abd9cee37be17246bcae78b2ebcbc"; - hash = "sha256-Rp+PJpms9qksP340K/uT/0zK0it4GLodkzLRWr0TRag="; + rev = "de6482e226443a210f27627e0240c12aa25c2925"; + hash = "sha256-knf7D44R22e/WV1rtrXJ1DVGhYJ7EM3r76ze0jtig/c="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop"; }; @@ -621,12 +621,12 @@ dot = buildGrammar { passthru.name = "dot"; language = "dot"; - version = "0.0.0+rev=80327abbba6f47530edeb0df9f11bd5d5c93c14d"; + version = "0.0.0+rev=71e2c5241eef9de920a4efedfefd1d527dd9a118"; src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; - rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d"; - hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y="; + rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118"; + hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0="; }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; @@ -1192,12 +1192,12 @@ gomod = buildGrammar { passthru.name = "gomod"; language = "gomod"; - version = "0.0.0+rev=2e886870578eeba1927a2dc4bd2e2b3f598c5f9a"; + version = "0.0.0+rev=6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a"; - hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g="; + rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"; + hash = "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -1508,24 +1508,24 @@ hyprlang = buildGrammar { passthru.name = "hyprlang"; language = "hyprlang"; - version = "0.0.0+rev=b23e85dded5d150ffee0ac83c01cbeb1520aad2f"; + version = "0.0.0+rev=d626ec06e4d876fc41200a30b3e6f2b4714c7367"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-hyprlang"; - rev = "b23e85dded5d150ffee0ac83c01cbeb1520aad2f"; - hash = "sha256-COIl7ngqTzQQBxgmRNCwF8x7OHNGCrUa5G/hPrlXsmw="; + rev = "d626ec06e4d876fc41200a30b3e6f2b4714c7367"; + hash = "sha256-f8CjiLd2tof+zfr7ze/CxZWtKRqQv8sK9Q21ZxEg6C8="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang"; }; idl = buildGrammar { passthru.name = "idl"; language = "idl"; - version = "0.0.0+rev=86d434e732f971ecec24571e0dcb6b14c8b19952"; + version = "0.0.0+rev=3632e926ef4ba924b05993683111480af0d5c9e3"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "86d434e732f971ecec24571e0dcb6b14c8b19952"; - hash = "sha256-u+2KBpk9ctry5cHlvqarYS8l5ERFlWrs9D09u2C6cvI="; + rev = "3632e926ef4ba924b05993683111480af0d5c9e3"; + hash = "sha256-fywOjqJ0yrG/QayyBXdc2iOtaytdc9bqd1leQ8kxR/0="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1733,14 +1733,14 @@ julia = buildGrammar { passthru.name = "julia"; language = "julia"; - version = "0.0.0+rev=a0b436e4a2895596eb9965a9493e18989defa521"; + version = "0.0.0+rev=73d1539a51b8a202d6d2471cc594cf4d7c5e673f"; src = fetchFromGitHub { - owner = "tree-sitter-grammars"; + owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "a0b436e4a2895596eb9965a9493e18989defa521"; - hash = "sha256-pdF/JI2H2zSsTuSIZFN1EmXqvoLgzOFG9IkhWm5XO3k="; + rev = "73d1539a51b8a202d6d2471cc594cf4d7c5e673f"; + hash = "sha256-szQqy52+LK/+nZneLzW2HITOhRUf2ld8lAoh5/7yb00="; }; - meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-julia"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; just = buildGrammar { passthru.name = "just"; @@ -1793,12 +1793,12 @@ kitty = buildGrammar { passthru.name = "kitty"; language = "kitty"; - version = "0.0.0+rev=2e9b602ca676cac63887cca5a4535106f3475c82"; + version = "0.0.0+rev=064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "tree-sitter-kitty"; - rev = "2e9b602ca676cac63887cca5a4535106f3475c82"; - hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0="; + rev = "064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5"; + hash = "sha256-DN6SWXZM1HedUtV7mDEEgictaI2V/pQHh5cg906qfO0="; }; meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty"; }; @@ -2038,12 +2038,12 @@ matlab = buildGrammar { passthru.name = "matlab"; language = "matlab"; - version = "0.0.0+rev=d8f5728f67877d829b6ccd1b8bd1e0ad02b22217"; + version = "0.0.0+rev=96a3e8fb0a4ebd0db64db6b52043483937e9ca3a"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "d8f5728f67877d829b6ccd1b8bd1e0ad02b22217"; - hash = "sha256-KnPiJ//tEy++W6yvUweFMhb2sUwZ8ccbIKeHzu7gJso="; + rev = "96a3e8fb0a4ebd0db64db6b52043483937e9ca3a"; + hash = "sha256-5Z4gLPZMx8uHFUGEgemjZNSoPxfv1Qum/OSBzM6fs7w="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -2086,12 +2086,12 @@ mlir = buildGrammar { passthru.name = "mlir"; language = "mlir"; - version = "0.0.0+rev=65435795eb4132d5eff66d62347050e863e5ebe5"; + version = "0.0.0+rev=47c3f2cf3b10016503f2577c2d99c15bb2053402"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "65435795eb4132d5eff66d62347050e863e5ebe5"; - hash = "sha256-s7oNzU7rTjejwgW9F28GayuxEe/Gn51+yQi7iPqgFfw="; + rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402"; + hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U="; }; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; generate = true; @@ -2208,12 +2208,12 @@ nu = buildGrammar { passthru.name = "nu"; language = "nu"; - version = "0.0.0+rev=47d4b4f5369c0cae866724758ae88ef07e10e4f1"; + version = "0.0.0+rev=4f4ac8667c1e7f80d0d9f9534845e63026210aaf"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "47d4b4f5369c0cae866724758ae88ef07e10e4f1"; - hash = "sha256-WY1qZbRLLTKNcyt7eQTzoQ2YKwyWSuUpVdt3YST6yx8="; + rev = "4f4ac8667c1e7f80d0d9f9534845e63026210aaf"; + hash = "sha256-Zkl5V7Rcw+1HoT1U5q8wRVR17wq6qP3gHPhiLYKF7H8="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -2345,12 +2345,12 @@ php = buildGrammar { passthru.name = "php"; language = "php"; - version = "0.0.0+rev=de11d0bcec62b8ed6b0c7edd55051042f37b8b05"; + version = "0.0.0+rev=9a85df21c63bdaf1695b7ac1430e29354cb5904f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "de11d0bcec62b8ed6b0c7edd55051042f37b8b05"; - hash = "sha256-NBBt7LNRUzfo/F0XYhz1C6o7r3ewPqETI3hKc+Rdrjg="; + rev = "9a85df21c63bdaf1695b7ac1430e29354cb5904f"; + hash = "sha256-fVJ51mYvz6eadUYmfRcOw7lRjGNKgQg+MIxkNAsA8KU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; location = "php"; @@ -2359,12 +2359,12 @@ php_only = buildGrammar { passthru.name = "php_only"; language = "php_only"; - version = "0.0.0+rev=de11d0bcec62b8ed6b0c7edd55051042f37b8b05"; + version = "0.0.0+rev=9a85df21c63bdaf1695b7ac1430e29354cb5904f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "de11d0bcec62b8ed6b0c7edd55051042f37b8b05"; - hash = "sha256-NBBt7LNRUzfo/F0XYhz1C6o7r3ewPqETI3hKc+Rdrjg="; + rev = "9a85df21c63bdaf1695b7ac1430e29354cb5904f"; + hash = "sha256-fVJ51mYvz6eadUYmfRcOw7lRjGNKgQg+MIxkNAsA8KU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; location = "php_only"; @@ -3505,12 +3505,12 @@ tmux = buildGrammar { passthru.name = "tmux"; language = "tmux"; - version = "0.0.0+rev=75d1b995b0c23400ac8e49db757a2e0386f9fa8f"; + version = "0.0.0+rev=815f8fa5ac7aeb6246c14896d16082fecdf98b2b"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "75d1b995b0c23400ac8e49db757a2e0386f9fa8f"; - hash = "sha256-LdXPdijcsfPYIrbTMDIy46wqOaJfxwVBVpOVVfXrJIg="; + rev = "815f8fa5ac7aeb6246c14896d16082fecdf98b2b"; + hash = "sha256-qOvP0ZMRBOGkr1qzlVfq85l8AkQHUGXVqZtix5GLcPo="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; };