Skip to content

treesitter: fix eval on unstable #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 2 commits into from
Apr 12, 2025
Merged

treesitter: fix eval on unstable #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
babcc10
treesitter: fix eval on unstable
SuperSandro2000 Apr 12, 2025
7bc5f9f
flake.lock: Update
SuperSandro2000 Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 9 additions & 30 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@

flake-utils.url = "github:numtide/flake-utils";

home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};

nixvim = {
url = "github:nix-community/nixvim";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";

# https://github.com/nix-community/nixvim/blob/main/flake.nix#L12-L34
nuschtosSearch.follows = "";
Expand Down
16 changes: 13 additions & 3 deletions modules/treesitter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{ lib, options, ... }:

{
let
# TODO: drop with 25.05
hasDependencies = lib.versionAtLeast lib.version "25.05";
in
lib.optionalAttrs hasDependencies {
dependencies = {
gcc.enable = false;
nodejs.enable = false;
tree-sitter.enable = false;
};
} // {
plugins.treesitter = {
enable = true;
# exclude some big (above 10 MB) and rarely used languages
Expand All @@ -11,12 +21,12 @@
&& g.pname != "verilog-grammar"
) options.plugins.treesitter.grammarPackages.default;

settings.highlight.enable = true;
} // lib.optionalAttrs (!hasDependencies) {
# we are not installing packages by hand
gccPackage = null;
nodejsPackage = null;
treesitterPackage = null;

settings.highlight.enable = true;
};

# Enable automatically closing and renaming HTML tags
Expand Down