collect edns under config/

crates/app/src/keys.rs

@@ -14,7 +14,7 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
         }
     }
     // Handle from root keymap
-    if let Some(command) = SourceIter(include_str!("../edn/arranger_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/arranger_keys.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? { app.history.push(undo); }
@@ -22,10 +22,10 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     }
     // Handle from selection-dependent keymaps
     if let Some(command) = match app.selected() {
-        Selection::Clip(_, _) => SourceIter(include_str!("../edn/arranger_keys_clip.edn")),
-        Selection::Track(_)   => SourceIter(include_str!("../edn/arranger_keys_track.edn")),
-        Selection::Scene(_)   => SourceIter(include_str!("../edn/arranger_keys_scene.edn")),
-        Selection::Mix        => SourceIter(include_str!("../edn/arranger_keys_mix.edn")),
+        Selection::Clip(_, _) => SourceIter(include_str!("../../../config/arranger_keys_clip.edn")),
+        Selection::Track(_)   => SourceIter(include_str!("../../../config/arranger_keys_track.edn")),
+        Selection::Scene(_)   => SourceIter(include_str!("../../../config/arranger_keys_scene.edn")),
+        Selection::Mix        => SourceIter(include_str!("../../../config/arranger_keys_mix.edn")),
     }.command::<_, TekCommand, _>(app, input) {
         if let Some(undo) = command.execute(app)? {
             app.history.push(undo);
@@ -39,7 +39,7 @@ pub fn handle_sequencer (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     if app.editor.handle(input)? == Some(true) {
         return Ok(Some(true))
     }
-    if let Some(command) = SourceIter(include_str!("../edn/sequencer_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/sequencer_keys.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? {
@@ -54,7 +54,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     if app.editor.handle(input)? == Some(true) {
         return Ok(Some(true))
     }
-    if let Some(command) = SourceIter(include_str!("../edn/groovebox_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/groovebox_keys.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? {
@@ -67,7 +67,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
 
 pub fn handle_sampler (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     let sampler = app.tracks[0].sampler_mut(0).expect("no sampler");
-    if let Some(command) = SourceIter(include_str!("../edn/sampler_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/sampler_keys.edn"))
         .command::<_, SamplerCommand, _>(sampler, input)
     {
         if let Some(undo) = command.execute(sampler)? {

crates/app/src/view.rs

@@ -868,7 +868,7 @@ impl Modal {
         Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))
     }
     fn view_help (&self) -> impl Content<TuiOut> {
-        let bindings = ||TokenIter::new(include_str!("../edn/groovebox_keys.edn"))
+        let bindings = ||TokenIter::new(include_str!("../../../config/groovebox_keys.edn"))
             .filter_map(|x|if let Value::Exp(_, iter)=x.value{
                 Some(iter)
             } else {

crates/cli/tek.rs

@@ -106,11 +106,11 @@ impl Cli {
                 color: ItemTheme::random(),
                 clock: Clock::new(jack, self.bpm)?,
                 view: SourceIter(match mode {
-                    LaunchMode::Clock           => include_str!("./edn/transport.edn"),
-                    LaunchMode::Sequencer       => include_str!("./edn/sequencer.edn"),
-                    LaunchMode::Groovebox       => include_str!("./edn/groovebox.edn"),
-                    LaunchMode::Arranger { .. } => include_str!("./edn/arranger.edn"),
-                    LaunchMode::Sampler         => include_str!("./edn/sampler.edn"),
+                    LaunchMode::Clock           => include_str!("../../config/transport.edn"),
+                    LaunchMode::Sequencer       => include_str!("../../config/sequencer.edn"),
+                    LaunchMode::Groovebox       => include_str!("../../config/groovebox.edn"),
+                    LaunchMode::Arranger { .. } => include_str!("../../config/arranger.edn"),
+                    LaunchMode::Sampler         => include_str!("../../config/sampler.edn"),
                     _ => todo!("{mode:?}"),
                 }),
                 pool: match mode {

crates/midi/src/clip/clip_editor.rs

@@ -21,7 +21,7 @@ impl Default for MidiEditor {
         Self {
             mode: PianoHorizontal::new(None),
             size: Measure::new(),
-            keys: SourceIter(include_str!("../../edn/keys_edit.edn")),
+            keys: SourceIter(include_str!("../../../../config/keys_edit.edn")),
         }
     }
 }

crates/midi/src/pool/pool_model.rs

@@ -23,10 +23,10 @@ impl Default for MidiPool {
             clips:   Arc::from(RwLock::from(vec![])),
             clip:    0.into(),
             mode:    None,
-            keys:        SourceIter(include_str!("../../edn/keys_pool.edn")),
-            keys_file:   SourceIter(include_str!("../../edn/keys_pool_file.edn")),
-            keys_rename: SourceIter(include_str!("../../edn/keys_clip_rename.edn")),
-            keys_length: SourceIter(include_str!("../../edn/keys_clip_length.edn")),
+            keys:        SourceIter(include_str!("../../../../config/keys_pool.edn")),
+            keys_file:   SourceIter(include_str!("../../../../config/keys_pool_file.edn")),
+            keys_rename: SourceIter(include_str!("../../../../config/keys_clip_rename.edn")),
+            keys_length: SourceIter(include_str!("../../../../config/keys_clip_length.edn")),
         }
     }
 }