Skip to content

Commit f576938

Browse files
authored
refactor: explicit treesit grammars (#427)
1 parent 1b744ed commit f576938

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

default.nix

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
buildElispPackage,
55
elispInputs,
66
emacs-all-the-icons-fonts,
7-
emacsPackages,
7+
treesit-grammars,
88
iosevka-bin,
99
ripgrep,
1010
xorg,
1111
}:
1212
let
13-
tree-sitter = emacsPackages.treesit-grammars.with-all-grammars;
14-
1513
init = buildElispPackage {
1614
ename = "config-init";
1715

@@ -38,7 +36,7 @@ let
3836
--funcall org-babel-tangle
3937
rm *.org
4038
41-
ln -s ${tree-sitter}/lib "$HOME/.config/emacs/tree-sitter"
39+
ln -s ${treesit-grammars}/lib "$HOME/.config/emacs/tree-sitter"
4240
'';
4341

4442
meta = { };
@@ -73,6 +71,6 @@ stdenv.mkDerivation {
7371
7472
install -D -t $out $src/templates
7573
76-
ln -s ${tree-sitter}/lib $out/tree-sitter
74+
ln -s ${treesit-grammars}/lib $out/tree-sitter
7775
'';
7876
}

flake.nix

+18
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,24 @@
112112
builtins.attrValues
113113
(builtins.filter lib.isDerivation)
114114
];
115+
116+
treesit-grammars = pkgs.emacsPackages.treesit-grammars.with-grammars (ps: [
117+
ps.tree-sitter-dockerfile
118+
ps.tree-sitter-elixir
119+
ps.tree-sitter-go
120+
ps.tree-sitter-gomod
121+
ps.tree-sitter-heex
122+
ps.tree-sitter-java
123+
ps.tree-sitter-javascript
124+
ps.tree-sitter-json
125+
ps.tree-sitter-lua
126+
ps.tree-sitter-nix
127+
ps.tree-sitter-python
128+
ps.tree-sitter-ruby
129+
ps.tree-sitter-rust
130+
ps.tree-sitter-typescript
131+
ps.tree-sitter-yaml
132+
]);
115133
};
116134
};
117135

0 commit comments

Comments
 (0)