Skip to content

Commit 32eca57

Browse files
committed
Update to vim-tidal custom supercollider boot file support
See mitchmindtree/vim-tidal@3fd9b07
1 parent 3dcdcb7 commit 32eca57

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# lands and following boot tidal and superdirt terminal commits.
2828
# See this PR: https://github.com/tidalcycles/vim-tidal/pull/74
2929
# url = "github:tidalcycles/vim-tidal/master";
30-
url = "github:mitchmindtree/vim-tidal/find-tidal-boot";
30+
url = "github:mitchmindtree/vim-tidal/find-sc-boot";
3131
flake = false;
3232
};
3333
vowel-src = {
@@ -73,14 +73,24 @@
7373
plugins = [pkgs.supercolliderPlugins.sc3-plugins];
7474
};
7575

76+
# A sclang command with superdirt included via conf yaml.
77+
sclang-with-superdirt = pkgs.writeShellApplication {
78+
name = "sclang-with-superdirt";
79+
runtimeInputs = [supercollider];
80+
text = ''
81+
${supercollider}/bin/sclang -l "${superdirt}/sclang_conf.yaml" "$@"
82+
'';
83+
};
84+
85+
# A very simple default superdirt start file.
86+
superdirt-start-sc = pkgs.writeText "superdirt-start.sc" "SuperDirt.start;";
87+
7688
# Run `SuperDirt.start` in supercollider, ready for tidal.
7789
superdirt-start = pkgs.writeShellApplication {
7890
name = "superdirt-start";
7991
runtimeInputs = [supercollider];
8092
text = ''
81-
${supercollider}/bin/sclang \
82-
-l "${superdirt}/sclang_conf.yaml" \
83-
${pkgs.writeText "superdirt-start.sc" "SuperDirt.start;"}
93+
${sclang-with-superdirt}/bin/sclang-with-superdirt ${superdirt-start-sc}
8494
'';
8595
};
8696

@@ -106,11 +116,14 @@
106116
if !exists("g:tidal_ghci")
107117
let g:tidal_ghci = "${ghcWithTidal}/bin/ghci"
108118
endif
119+
if !exists("g:tidal_sclang")
120+
let g:tidal_sclang = "${sclang-with-superdirt}/bin/sclang-with-superdirt"
121+
endif
109122
if !exists("g:tidal_boot_fallback")
110123
let g:tidal_boot_fallback = "${inputs.tidal-src}/BootTidal.hs"
111124
endif
112-
if !exists("g:tidal_superdirt_start")
113-
let g:tidal_superdirt_start = "${superdirt-start}/bin/superdirt-start"
125+
if !exists("g:tidal_sc_boot_fallback")
126+
let g:tidal_sc_boot_fallback = "${superdirt-start-sc}"
114127
endif
115128
'';
116129
in ''

0 commit comments

Comments
 (0)