File tree Expand file tree Collapse file tree 5 files changed +35
-2
lines changed
Expand file tree Collapse file tree 5 files changed +35
-2
lines changed Original file line number Diff line number Diff line change 88, settingsSchema
99} :
1010
11+ with { inherit ( settings ) packages ; } ;
1112with { inherit ( settings . interface ) attrs extensions ; } ;
1213
1314let
2122 echo_and_run ${ typst } /bin/typst compile "$1" "$2"
2223 '' ;
2324
25+ typstToUse = typst . withPackages ( ps : ( map ( x : ps . ${ x } ) packages ) ) ;
26+
2427 languageServers = lib . optionals settings . lsp . tinymist . enable
25- [ ( callPackage ./language_server_tinymist { inherit kernelName ; } ) ] ;
28+ [ ( callPackage ./language_server_tinymist { inherit kernelName typstToUse ; } ) ] ;
2629
2730 packageOptions = typst . packages ;
2831 packageSearch = common . searcher packageOptions ;
3538symlinkJoin {
3639 name = "codedown-exporter-typst" ;
3740 paths = [
38- ( callPackage ./kernel.nix { inherit attrs extensions ; } )
41+ ( callPackage ./kernel.nix { inherit attrs extensions typstToUse ; } )
3942 script
4043 ]
4144 ++ languageServers
Original file line number Diff line number Diff line change 11{ lib
22, callPackage
33, typst
4+ , typstToUse # TODO: should this kernel actually do something?
45
56, attrs
67, extensions
Original file line number Diff line number Diff line change 33
44, tinymist
55
6+ # TODO: how to make the typstToUse (i.e. Typst with some packages) available to tinymist?
7+ , typstToUse
8+
69, kernelName
710} :
811
Original file line number Diff line number Diff line change 22
33with lib ;
44
5+ let
6+ subPackage = types . submodule {
7+ options = {
8+ name = mkOption {
9+ description = "Package name" ;
10+ type = types . str ;
11+ } ;
12+ outputs = mkOption {
13+ example = "Package outputs to include" ;
14+ type = types . listOf types . str ;
15+ } ;
16+ } ;
17+ } ;
18+
19+ in
20+
521{
622 options = {
723 exporters . typst = {
@@ -13,6 +29,13 @@ with lib;
1329 visible = false ;
1430 } ;
1531
32+ packages = mkOption {
33+ example = "List of packages" ;
34+ type = types . listOf ( types . either types . str subPackage ) ;
35+ default = [ ] ;
36+ visible = false ;
37+ } ;
38+
1639 interface . attrs = mkOption {
1740 example = boilerplate . attrsTitle ;
1841 description = boilerplate . attrsDescription ;
Original file line number Diff line number Diff line change @@ -6,4 +6,7 @@ codedown.makeEnvironment {
66 name = "exporters-typst" ;
77
88 exporters . typst . enable = true ;
9+ exporters . typst . packages = [
10+ "aero-check"
11+ ] ;
912}
You can’t perform that action at this time.
0 commit comments