wip: unify default configs

the definitions are unified alright. it's just not supported yet :D

the idea being that tek offers to write out the default configs to
~/.config/tek-v0 where the user can customize them.

Cargo.lock

@@ -2395,6 +2395,7 @@ dependencies = [
  "tengri",
  "tengri_proc",
  "toml",
+ "xdg",
 ]
 
 [[package]]
@@ -3408,6 +3409,12 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
 
+[[package]]
+name = "xdg"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
+
 [[package]]
 name = "xkbcommon-dl"
 version = "0.4.2"

Cargo.toml

@@ -51,6 +51,7 @@ toml         = { version = "0.9.2" }
 uuid         = { version = "1.10.0", features = [ "v4" ] }
 wavers       = { version = "1.4.3" }
 winit        = { version = "0.30.4", features = [ "x11" ] }
+xdg          = { version = "3.0.0" }
 #once_cell = "1.19.0"
 #no_deadlocks = "1.3.2"
 #suil-rs = { path = "../suil" }

config/bindings.edn

@@ -0,0 +1,167 @@
+(module "global.edn"
+  (@u            history/undo          1)
+  (@r            history/redo          1)
+  (@esc          dialog/hide)          
+  (@f1           dialog/show           :dialog-help)
+  (@f6           dialog/show           :dialog-save)
+  (@f8           dialog/show           :dialog-options)
+  (@f9           dialog/show           :dialog-load)
+  (@f10          dialog/show           :dialog-quit))
+
+(module "clock.edn"
+  (@space        clock/toggle          0)
+  (@shift-space  clock/toggle          0))
+
+(module "arranger.edn"
+  (@c            color)
+  (@q            launch)
+  (@tab          project/edit)
+  (@enter        project/edit)
+  (@escape       project/home)
+  (@shift-I      project/input-add)
+  (@shift-O      project/output-add)
+  (@shift-S      project/scene-add)
+  (@shift-T      project/track-add)
+  (@shift-D      dialog/show           :dialog-device)
+  (@up           select                :select-scene-prev)
+  (@down         select                :select-scene-next)
+  (@left         select                :select-track-prev)
+  (@right        select                :select-track-next)
+  (@t            select                :select-track)
+  (@s            select                :select-scene))
+
+(module "track.edn"
+  (@delete       track/delete          :track)
+  (@q            track/launch          :track)
+  (@c            track/color           :track)
+  (@comma        track/prev)
+  (@period       track/next)
+  (@lt           track/swap-prev)
+  (@gt           track/swap-next)
+  (@r            track/rec)
+  (@m            track/mon)
+  (@p            track/play)
+  (@P            track/solo))
+
+(module "scene.edn"
+  (@delete       scene/delete          :scene)
+  (@q            scene/launch          :scene)
+  (@c            scene/color           :scene)
+  (@comma        scene/prev)
+  (@period       scene/next)
+  (@lt           scene/swap-prev)
+  (@gt           scene/swap-next))
+
+(module "clip.edn"
+  (@g            clip/get)
+  (@p            clip/put)
+  (@delete       clip/del)
+  (@comma        clip/prev)
+  (@period       clip/next)
+  (@lt           clip/swap-prev)
+  (@gt           clip/swap-next)
+  (@l            clip/loop-toggle))
+
+(module "browser.edn"
+  (@escape       browser/cancel)
+  (@return       browser/confirm)
+  (@up           browser/cursor/set    :browser-cursor-prev)
+  (@down         browser/cursor/set    :browser-cursor-next)
+  (@right        browser/address/set   :browser-address-selected)
+  (@left         browser/address/set   :browser-address-parent)
+  (:char         browser/filter/append :char)
+  (@backspace    browser/filter/delete :last))
+
+(module "device_add.edn"
+  (@up           dialog                :dialog-device-prev)
+  (@down         dialog                :dialog-device-next))
+
+(module "editor.edn"
+  (@left         editor/time/set       :time-pos-prev)
+  (@shift-left   editor/time/set       :time-pos-prev-fine)
+  (@right        editor/time/set       :time-pos-next)
+  (@shift-right  editor/time/set       :time-pos-next-fine)
+  (@equal        editor/zoom/set       :time-zoom-prev)
+  (@minus        editor/zoom/set       :time-zoom-next)
+  (@plus         editor/zoom/set       :time-zoom-next-fine)
+  (@underscore   editor/zoom/set       :time-zoom-prev-fine)
+  (@z            editor/lock/set)
+  (@comma        editor/length/set     :note-len-prev)
+  (@period       editor/length/set     :note-len-next)
+  (@lt           editor/length/set     :note-len-prev)
+  (@gt           editor/length/set     :note-len-next)
+  (@up           editor/pitch/set      :note-pos-next)
+  (@down         editor/pitch/set      :note-pos-prev)
+  (@pgup         editor/pitch/set      :note-pos-next-octave)
+  (@pgdn         editor/pitch/set      :note-pos-prev-octave)
+  (@a            editor/append         :true)
+  (@enter        editor/append         :false)
+  (@del          editor/delete-note)
+  (@shift-del    editor/delete-note))
+
+(module "groovebox.edn"
+  (@r            sampler/record/toggle :sample)
+  (@tab          focus/next)
+  (@shift-tab    focus/prev))
+
+(module "length.edn"
+  (@up           inc)
+  (@down         dec)
+  (@right        next)
+  (@left         prev)
+  (@return       set                   :length)
+  (@escape       cancel))
+
+(module "message.edn"
+  (@esc          message/dismiss)
+  (@enter        message/dismiss))
+
+(module "pool.edn"
+  (@n            rename/begin)
+  (@t            length/begin)
+  (@m            import/begin)
+  (@x            export/begin)
+  (@c            clip/color            :clip       :random-color)
+  (@openbracket  select                :clip-prev)
+  (@closebracket select                :clip-next)
+  (@lt           swap                  :clip       :clip-prev)
+  (@gt           swap                  :clip       :clip-next)
+  (@delete       clip/delete           :clip)
+  (@shift-A      clip/add              :after      :new-clip)
+  (@shift-D      clip/add              :after      :cloned-clip))
+
+(module "pool_file.edn"
+  (@up           select                :prev)
+  (@down         select                :next)
+  (@right        chdir                 :selected)
+  (@left         chdir                 :parent)
+  (@return       confirm)
+  (@escape       cancel)
+  (:char         append                :char)
+  (@backspace    delete                :last))
+
+(module "rename.edn"
+  (:char         append                :char)
+  (@backspace    delete                :last)
+  (@return       confirm)
+  (@escape       cancel))
+
+(module "sampler.edn"
+  (@up           sampler/select        :sample-above)
+  (@down         sampler/select        :sample-below)
+  (@left         sampler/select        :sample-to-left)
+  (@right        sampler/select        :sample-to-right)
+
+  (@r            sampler/record-toggle :sample-selected)
+  (@shift-R      sampler/record-cancel)
+  (@p            sampler/play-sample   :sample-selected)
+  (@P            sampler/stop-sample   :sample-selected)
+
+  (@shift-f6     dialog                :dialog-export-sample)
+  (@shift-f9     dialog                :dialog-import-sample))
+
+(module "sequencer.edn"
+  (@c            color)
+  (@q            launch)
+  (@shift-I      input/add)
+  (@shift-O      output/add))

config/config_arranger.edn

@@ -1,31 +0,0 @@
-(name
-  "Arranger")
-(info
-  "A grid of launchable clips arranged by track and scene.")
-(keys
-  (cond :focus-editor      (load "./keys_editor.edn"))
-  (cond :focus-dialog      (load "./keys_dialog.edn"))
-  (cond :focus-message     (load "./keys_message.edn"))
-  (cond :focus-device-add  (load "./keys_device_add.edn"))
-  (cond :focus-browser     (load "./keys_browser.edn"))
-  (cond :focus-pool-rename (load "./keys_rename.edn"))
-  (cond :focus-pool-length (load "./keys_length.edn"))
-  (cond :focus-clip        (load "./keys_clip.edn"))
-  (cond :focus-track       (load "./keys_track.edn"))
-  (cond :focus-scene       (load "./keys_scene.edn"))
-  (cond :focus-mix         (load "./keys_mix.edn"))
-  (load "./keys_clock.edn")
-  (load "./keys_arranger.edn")
-  (load "./keys_global.edn"))
-(view
-  (bsp/a :view-dialog
-    (bsp/w :view-meters-output
-      (bsp/e :view-meters-input
-        (bsp/n (fixed/y 2 :view-status-h2)
-          (bsp/n :view-tracks-inputs
-            (bsp/s :view-tracks-devices
-              (bsp/s :view-tracks-outputs
-                (bsp/s :view-tracks-names
-                  (fill/xy (either :focus-editor
-                    (bsp/e :view-scenes-names :view-editor)
-                    :view-scenes)))))))))))

config/config_groovebox.edn

@@ -1,28 +0,0 @@
-(name "Groovebox")
-
-(info "A sequencer with built-in sampler.")
-
-(keys
-  (layer-if :focus-browser     "./keys_browser.edn")
-  (layer-if :focus-pool-rename "./keys_rename.edn")
-  (layer-if :focus-pool-length "./keys_length.edn")
-  (layer                       "./keys_clock.edn")
-  (layer                       "./keys_editor.edn")
-  (layer                       "./keys_sampler.edn")
-  (layer                       "./keys_global.edn"))
-
-(view (bsp/a :view-dialog (bsp/w :view-meters-output (bsp/e :view-meters-input
-  (bsp/w
-    (fill/y (align/n
-      (bsp/s :view-midi-ins-status
-        (bsp/s :view-midi-outs-status
-          (bsp/s :view-audio-ins-status
-            (bsp/s :view-audio-outs-status
-              :view-pool))))))
-    (bsp/n
-      (fixed/y :h-sample-detail
-        (bsp/e (fill/y (fixed/x 20 (align/nw :view-sample-status)))
-          :view-sample-viewer))
-        (bsp/e
-          (fill/y (align/n (bsp/s :view-status-v :view-editor-status)))
-          (bsp/e :view-samples-keys :view-editor))))))))

config/config_sampler.edn

@@ -1,13 +0,0 @@
-(name "Sampler")
-
-(info "A sampling soundboard.")
-
-(keys
-  (layer "./keys_sampler.edn")
-  (layer "./keys_global.edn"))
-
-(view
-  (bsp/a                :view-dialog
-    (bsp/s (fixed/y   1 :view-transport)
-      (bsp/n (fixed/y 1 :view-status)
-        (fill/xy        :view-samples-grid)))))

config/config_sequencer.edn

@@ -1,19 +0,0 @@
-(name "Sequencer")
-
-(info "A MIDI sequencer.")
-
-(keys
-  (layer-if :focus-browser    "./keys_browser.edn")
-  (layer-if :mode-pool-rename "./keys_rename.edn")
-  (layer-if :mode-pool-length "./keys_length.edn")
-  (layer                      "./keys_editor.edn")
-  (layer                      "./keys_clock.edn")
-  (layer                      "./keys_global.edn"))
-
-(view
-  (bsp/a                      :view-dialog
-    (bsp/s (fixed/y         1 :view-transport)
-      (bsp/n (fixed/y       1 :view-status)
-        (fill/xy (bsp/a
-          (fill/xy (align/e   :view-pool))
-                              :view-editor)))))

config/config_transport.edn

@@ -1,9 +0,0 @@
-(name "Transport")
-
-(info "A JACK transport controller.")
-
-(keys
-  (layer "./keys_clock.edn")
-  (layer "./keys_global.edn"))
-
-(view :view-transport)

config/keys_arranger.edn

@@ -1,17 +0,0 @@
-(@c       color)
-(@q       launch)
-(@tab     project edit)
-(@enter   project edit)
-(@escape  project home)
-(@shift-I project input-add)
-(@shift-O project output-add)
-(@shift-S project scene-add)
-(@shift-T project track-add)
-(@shift-D dialog open :dialog-device)
-
-(@up    select :select-scene-prev)
-(@down  select :select-scene-next)
-(@left  select :select-track-prev)
-(@right select :select-track-next)
-(@t     select :select-track)
-(@s     select :select-scene)

config/keys_arranger_clip.edn

@@ -1 +0,0 @@
-

config/keys_browser.edn

@@ -1,8 +0,0 @@
-(@escape    browser cancel)
-(@return    browser confirm)
-(@up        browser set-cursor  :browser-cursor-prev)
-(@down      browser set-cursor  :browser-cursor-next)
-(@right     browser set-address :browser-address-selected)
-(@left      browser set-address :browser-address-parent)
-(:char      browser append-to-search ;char)
-(@backspace browser delete-from-search :last)

config/keys_clip.edn

@@ -1,8 +0,0 @@
-(@g      clip get)
-(@p      clip put)
-(@delete clip del)
-(@comma  clip prev)
-(@period clip next)
-(@lt     clip swap-prev)
-(@gt     clip swap-next)
-(@l      clip loop-toggle)

config/keys_clock.edn

@@ -1,2 +0,0 @@
-(@space       clock toggle-playback 0)
-(@shift-space clock toggle-playback 0)

config/keys_device_add.edn

@@ -1,2 +0,0 @@
-(@up   toggle-dialog :dialog-device-prev)
-(@down toggle-dialog :dialog-device-next)

config/keys_editor.edn

@@ -1,26 +0,0 @@
-(@left        editor set-time-pos :time-pos-prev)
-(@shift-left  editor set-time-pos :time-pos-prev-fine)
-(@right       editor set-time-pos :time-pos-next)
-(@shift-right editor set-time-pos :time-pos-next-fine)
-
-(@equal       editor set-time-zoom :time-zoom-prev)
-(@minus       editor set-time-zoom :time-zoom-next)
-(@plus        editor set-time-zoom :time-zoom-next-fine)
-(@underscore  editor set-time-zoom :time-zoom-prev-fine)
-
-(@z           editor set-time-lock)
-
-(@up          editor set-note-pos :note-pos-next)
-(@down        editor set-note-pos :note-pos-prev)
-(@pgup        editor set-note-pos :note-pos-next-octave)
-(@pgdn        editor set-note-pos :note-pos-prev-octave)
-
-(@comma       editor set-note-len :note-len-prev)
-(@period      editor set-note-len :note-len-next)
-(@lt          editor set-note-len :note-len-prev)
-(@gt          editor set-note-len :note-len-next)
-
-(@a           editor append-note :true)
-(@enter       editor append-note :false)
-(@del         editor delete-note)
-(@shift-del   editor delete-note)

config/keys_global.edn

@@ -1,9 +0,0 @@
-(@esc dialog :dialog-none)
-(@f1  dialog :dialog-help)
-(@f6  dialog :dialog-save)
-(@f8  dialog :dialog-options)
-(@f9  dialog :dialog-load)
-(@f10 dialog :dialog-quit)
-
-(@u undo 1)
-(@r redo 1)

config/keys_groovebox.edn

@@ -1,3 +0,0 @@
-(@r         sampler record/toggle :sample)
-(@tab       focus-next)
-(@shift-tab focus-prev)

config/keys_length.edn

@@ -1,6 +0,0 @@
-(@up     inc)
-(@down   dec)
-(@right  next)
-(@left   prev)
-(@return set :length)
-(@escape cancel)

config/keys_message.edn

@@ -1,2 +0,0 @@
-(@esc   message dismiss)
-(@enter message dismiss)

config/keys_pool.edn

@@ -1,12 +0,0 @@
-(@n            rename begin)
-(@t            length begin)
-(@m            import begin)
-(@x            export begin)
-(@c            clip color :clip :random-color)
-(@openbracket  select :clip-prev)
-(@closebracket select :clip-next)
-(@lt           swap :clip :clip-prev)
-(@gt           swap :clip :clip-next)
-(@delete       clip/delete :clip)
-(@shift-A      clip/add :after :new-clip)
-(@shift-D      clip/add :after :cloned-clip)

config/keys_pool_file.edn

@@ -1,8 +0,0 @@
-(@up        select :prev)
-(@down      select :next)
-(@right     chdir  :selected)
-(@left      chdir  :parent)
-(@return    confirm)
-(@escape    cancel)
-(:char      append :char)
-(@backspace delete :last)

config/keys_rename.edn

@@ -1,4 +0,0 @@
-(:char      append :char)
-(@backspace delete :last)
-(@return    confirm)
-(@escape    cancel)

config/keys_sampler.edn

@@ -1,12 +0,0 @@
-(@up      sampler select :sample-above)
-(@down    sampler select :sample-below)
-(@left    sampler select :sample-to-left)
-(@right   sampler select :sample-to-right)
-
-(@r       sampler record-toggle :sample-selected)
-(@shift-R sampler record-cancel)
-(@p       sampler play-sample :sample-selected)
-(@P       sampler stop-sample :sample-selected)
-
-(@shift-f6 dialog :dialog-export-sample)
-(@shift-f9 dialog :dialog-import-sample)

config/keys_scene.edn

@@ -1,7 +0,0 @@
-(@delete scene delete :scene)
-(@q      scene launch :scene)
-(@c      scene color  :scene)
-(@comma  scene prev)
-(@period scene next)
-(@lt     scene swap-prev)
-(@gt     scene swap-next)

config/keys_sequencer.edn

@@ -1,4 +0,0 @@
-(@c       color)
-(@q       launch)
-(@shift-I input add)
-(@shift-O output add)

config/keys_track.edn

@@ -1,11 +0,0 @@
-(@delete track delete :track)
-(@q      track launch :track)
-(@c      track color  :track)
-(@comma  track prev)
-(@period track next)
-(@lt     track swap-prev)
-(@gt     track swap-next)
-(@r      track rec)
-(@m      track mon)
-(@p      track play)
-(@P      track solo)

config/templates.edn

@@ -0,0 +1,73 @@
+(module "transport.edn"
+  (name "Transport")
+  (info "A JACK transport controller.")
+  (bind "keys/clock.edn")
+  (bind "keys/global.edn")
+  :view/transport)
+
+(module "arranger.edn"
+  (name "Arranger")
+  (info "A grid of launchable clips arranged by track and scene.")
+  (bind "keys/editor.edn"     :focused/editor)
+  (bind "keys/dialog.edn"     :focused/dialog)
+  (bind "keys/message.edn"    :focused/message)
+  (bind "keys/device_add.edn" :focused/device/add)
+  (bind "keys/browser.edn"    :focused/browser)
+  (bind "keys/rename.edn"     :focused/pool/rename)
+  (bind "keys/length.edn"     :focused/pool/length)
+  (bind "keys/clip.edn"       :focused/clip)
+  (bind "keys/track.edn"      :focused/track)
+  (bind "keys/scene.edn"      :focused/scene)
+  (bind "keys/mix.edn"        :focused/mix)
+  (bind "keys/clock.edn")
+  (bind "keys/arranger.edn")
+  (bind "keys/global.edn")
+  :view/dialog
+  (bsp/w :view/meters/output (bsp/e :view/meters/input (stack/n
+    (fixed/y 2 :view/status/h2) :view/tracks/inputs
+    (stack/s :view/tracks/devices :view/tracks/outputs :view/tracks/names
+      (fill/xy (either :focused/editor (bsp/e :view/scenes/names :view/editor) :view/scenes)))))))
+
+(module "groovebox.edn"
+  (name "Groovebox")
+  (info "A sequencer with built-in sampler.")
+  (bind "keys/browser.edn" :focused/browser)
+  (bind "keys/rename.edn"  :focused/pool/rename)
+  (bind "keys/length.edn"  :focused/pool/length)
+  (bind "keys/clock.edn")
+  (bind "keys/editor.edn")
+  (bind "keys/sampler.edn")
+  (bind "keys/global.edn")
+  :view/dialog
+  (bsp/w :view/meters/output (bsp/e :view/meters/input (bsp/w
+    (fill/y (align/n (stack/s :view/midi-ins/status :view/midi-outs/status
+                              :view/audio-ins/status :view/audio-outs/status
+                              :view/pool)))
+    (bsp/n (fixed/y :h-sample-detail (bsp/e (fill/y (fixed/x 20 (align/nw :view/sample/status)))
+                                            :view/sample/viewer))
+           (stack/e (fill/y (align/n (bsp/s :view/status/v :view/editor/status)))
+                    :view/samples/keys :view/editor))))))
+
+(module "sampler.edn"
+  (name "Sampler")
+  (info "A sampling soundboard.")
+  (bind "keys/sampler.edn")
+  (bind "keys/global.edn")
+  :view/dialog
+  (bsp/s (fixed/y 1 :view/transport) (bsp/n (fixed/y 1 :view/status)
+    (fill/xy :view/samples/grid))))
+
+(module "sequencer.edn"
+  (name "Sequencer")
+  (info "A MIDI sequencer.")
+  (bind "keys/browser.edn" :focused/browser)
+  (bind "keys/rename.edn"  :mode/pool-rename)
+  (bind "keys/length.edn"  :mode/pool-length)
+  (bind "keys/editor.edn")
+  (bind "keys/clock.edn")
+  (bind "keys/global.edn")
+  :view/dialog
+  (bsp/s (fixed/y 1 :view/transport)
+         (bsp/n (fixed/y 1 :view/status)
+                (fill/xy (bsp/a (fill/xy (align/e :view/pool))
+                                :view/editor)))))

crates/app/Cargo.toml

@@ -15,6 +15,7 @@ clap      = { workspace = true, optional = true }
 palette   = { workspace = true }
 rand      = { workspace = true }
 toml      = { workspace = true }
+xdg       = { workspace = true }
 
 [dev-dependencies]
 proptest        = { workspace = true }

crates/app/src/api.rs

@@ -7,7 +7,9 @@ macro_rules! cmd_todo { ($msg:literal) => {{ println!($msg); None }}; }
 handle!(TuiIn: |self: App, input|self.handle_tui_key_with_history(input));
 impl App {
     fn handle_tui_key_with_history (&mut self, input: &TuiIn) -> Perhaps<bool> {
-        Ok(if let Some(binding) = self.config.keys.dispatch(input.event()) {
+        Ok(if let Some(binding) = self.configs.current.as_ref()
+            .map(|c|c.keys.dispatch(input.event())).flatten()
+        {
             let binding = binding.clone();
             let undo = binding.command.clone().execute(self)?;
             // FIXME failed commands are not persisted in undo history

crates/app/src/config.rs

@@ -0,0 +1,112 @@
+use crate::*;
+use xdg::BaseDirectories;
+
+/// Configurations
+#[derive(Default, Debug)]
+pub struct Configurations {
+    pub dirs:    BaseDirectories,
+    pub modules: Arc<RwLock<std::collections::BTreeMap<Arc<str>, Arc<str>>>>,
+    pub current: Option<Configuration>
+}
+
+/// Configuration
+#[derive(Default, Debug)]
+pub struct Configuration {
+    /// Path of configuration entrypoint
+    pub path: std::path::PathBuf,
+    /// Name of configuration
+    pub name: Option<Arc<str>>,
+    /// Description of configuration
+    pub info: Option<Arc<str>>,
+    /// View definition
+    pub view: Arc<str>,
+    // Input keymap
+    pub keys: EventMap<TuiEvent, AppCommand>,
+}
+
+macro_rules! dsl_for_each (($dsl:expr => $body:expr)=>{
+    let mut dsl: Arc<str> = $dsl.src().into();
+    let mut head: Option<Arc<str>> = dsl.head()?.map(Into::into);
+    let mut tail: Option<Arc<str>> = dsl.tail()?.map(Into::into);
+    loop {
+        $body;
+        if let Some(next) = tail {
+            head = next.head()?.map(Into::into);
+            tail = next.tail()?.map(Into::into);
+        } else {
+            break
+        }
+    }
+});
+
+impl Configurations {
+    pub fn init () -> Usually<Self> {
+        let mut directories = BaseDirectories::with_profile("tek", "v0");
+        let mut configurations = Self { dirs: directories, ..Default::default() };
+        configurations.init_templates()?;
+        configurations.init_bindings()?;
+        Ok(configurations)
+    }
+
+    const DEFAULT_TEMPLATES: &'static str = include_str!("../../../config/templates.edn");
+    fn init_templates (&mut self) -> Usually<()> {
+        if let Some(path) = self.dirs.find_config_file("templates.edn") {
+            todo!()
+        } else {
+            let path = self.dirs.place_config_file("templates.edn")?;
+            dsl_for_each!(Self::DEFAULT_TEMPLATES => todo!());
+            Ok(())
+        } 
+    }
+
+    const DEFAULT_BINDINGS: &'static str = include_str!("../../../config/bindings.edn");
+    fn init_bindings (&mut self) -> Usually<()> {
+        if let Some(path) = self.dirs.find_config_file("bindings.edn") {
+            todo!()
+        } else {
+            let path = self.dirs.place_config_file("bindings.edn")?;
+            dsl_for_each!(Self::DEFAULT_BINDINGS => todo!());
+            Ok(())
+        }
+    }
+}
+
+impl Configuration {
+    fn load_template (&mut self, dsl: impl Dsl) -> Usually<&mut Self> {
+        dsl_for_each!(dsl => match () {
+            _ if let Some(exp) = dsl.exp()? => match exp.head()?.key()? {
+                Some("name") => match exp.tail()?.text()? {
+                    Some(name) => self.name = Some(name.into()),
+                    _ => return Err(format!("missing name definition").into())
+                },
+                Some("info") => match exp.tail()?.text()? {
+                    Some(info) => self.info = Some(info.into()),
+                    _ => return Err(format!("missing info definition").into())
+                },
+                Some("bind") => match exp.tail()? {
+                    Some(keys) => self.keys = EventMap::from_dsl(&mut &keys)?,
+                    _ => return Err(format!("missing keys definition").into())
+                },
+                Some("view") => match exp.tail()? {
+                    Some(tail) => self.view = tail.src().into(),
+                    _ => return Err(format!("missing view definition").into())
+                },
+                dsl => return Err(format!("unexpected: {dsl:?}").into())
+            },
+
+            _ => return Err(format!("unexpected: {dsl:?}").into())
+        });
+        Ok(self)
+    }
+    fn load_binding (&mut self, dsl: impl Dsl) -> Usually<&mut Self> {
+        todo!();
+        Ok(self)
+    }
+}
+
+fn unquote (x: &str) -> &str {
+    let mut chars = x.chars();
+    chars.next();
+    //chars.next_back();
+    chars.as_str()
+}

crates/app/src/lib.rs

@@ -36,6 +36,7 @@ pub(crate) use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::Relaxed};
 
 mod api;    pub use self::api::*;
 mod audio;  pub use self::audio::*;
+mod config; pub use self::config::*;
 mod model;  pub use self::model::*;
 mod view;   pub use self::view::*;
 

crates/app/src/model.rs

@@ -1,6 +1,7 @@
 use crate::*;
 use std::path::PathBuf;
 use std::error::Error;
+
 #[derive(Default, Debug)]
 pub struct App {
     /// Must not be dropped for the duration of the process
@@ -9,8 +10,8 @@ pub struct App {
     pub size:    Measure<TuiOut>,
     /// Performance counter
     pub perf:    PerfModel,
-    // View and input definition
-    pub config: Configuration,
+    /// Available view definitions and input bindings
+    pub configs: Configurations,
     /// Contains all recently created clips.
     pub pool:    Pool,
     /// Contains the currently edited musical arrangement
@@ -22,45 +23,6 @@ pub struct App {
     /// Base color.
     pub color:   ItemTheme,
 }
-has!(Jack<'static>:      |self: App|self.jack);
-has!(Pool:               |self: App|self.pool);
-has!(Option<Dialog>:     |self: App|self.dialog);
-has!(Clock:              |self: App|self.project.clock);
-has!(Option<MidiEditor>: |self: App|self.project.editor);
-has!(Selection:          |self: App|self.project.selection);
-has!(Vec<MidiInput>:     |self: App|self.project.midi_ins);
-has!(Vec<MidiOutput>:    |self: App|self.project.midi_outs);
-has!(Vec<Scene>:         |self: App|self.project.scenes);
-has!(Vec<Track>:         |self: App|self.project.tracks);
-has!(Measure<TuiOut>:    |self: App|self.size);
-maybe_has!(Track: |self: App|
-    { MaybeHas::<Track>::get(&self.project) };
-    { MaybeHas::<Track>::get_mut(&mut self.project) });
-impl HasTrackScroll for App { fn track_scroll (&self) -> usize { self.project.track_scroll() } }
-maybe_has!(Scene: |self: App|
-    { MaybeHas::<Scene>::get(&self.project) };
-    { MaybeHas::<Scene>::get_mut(&mut self.project) });
-impl HasSceneScroll for App { fn scene_scroll (&self) -> usize { self.project.scene_scroll() } }
-has_clips!(|self: App|self.pool.clips);
-impl HasClipsSize for App { fn clips_size (&self) -> &Measure<TuiOut> { &self.project.inner_size } }
-//take!(ClockCommand       |state: App, iter|Take::take(state.clock(), iter));
-//take!(MidiEditCommand    |state: App, iter|Ok(state.editor().map(|x|Take::take(x, iter)).transpose()?.flatten()));
-//take!(PoolCommand        |state: App, iter|Take::take(&state.pool, iter));
-//take!(SamplerCommand     |state: App, iter|Ok(state.project.sampler().map(|x|Take::take(x, iter)).transpose()?.flatten()));
-//take!(ArrangementCommand |state: App, iter|Take::take(&state.project, iter));
-//take!(DialogCommand      |state: App, iter|Take::take(&state.dialog, iter));
-//has_editor!(|self: App|{
-    //editor = self.editor;
-    //editor_w = {
-        //let size      = self.size.w();
-        //let editor    = self.editor.as_ref().expect("missing editor");
-        //let time_len  = editor.time_len().get();
-        //let time_zoom = editor.time_zoom().get().max(1);
-        //(5 + (time_len / time_zoom)).min(size.saturating_sub(20)).max(16)
-    //};
-    //editor_h = 15;
-    //is_editing = self.editor.is_some();
-//});
 
 impl App {
     pub fn update_clock (&self) {
@@ -190,20 +152,16 @@ impl App {
         self.browser().is_some()
     }
     fn focus_clip (&self) -> bool {
-        !self.focus_editor() && matches!(self.selection(),
-            Selection::TrackClip{..})
+        !self.focus_editor() && matches!(self.selection(), Selection::TrackClip{..})
     }
     fn focus_track (&self) -> bool {
-        !self.focus_editor() && matches!(self.selection(),
-            Selection::Track(..))
+        !self.focus_editor() && matches!(self.selection(), Selection::Track(..))
     }
     fn focus_scene (&self) -> bool {
-        !self.focus_editor() && matches!(self.selection(),
-            Selection::Scene(..))
+        !self.focus_editor() && matches!(self.selection(), Selection::Scene(..))
     }
     fn focus_mix (&self) -> bool {
-        !self.focus_editor() && matches!(self.selection(),
-            Selection::Mix)
+        !self.focus_editor() && matches!(self.selection(), Selection::Mix)
     }
     fn focus_pool_import (&self) -> bool {
         matches!(self.pool.mode, Some(PoolMode::Import(..)))
@@ -318,99 +276,43 @@ impl App {
     }
 }
 
-/// Configuration
-#[derive(Default, Debug)]
-pub struct Configuration {
-    /// Path of configuration entrypoint
-    pub path: PathBuf,
-    /// Name of configuration
-    pub name: Option<Arc<str>>,
-    /// Description of configuration
-    pub info: Option<Arc<str>>,
-    /// View definition
-    pub view: Arc<str>,
-    // Input keymap
-    pub keys: EventMap<TuiEvent, AppCommand>,
-}
+has!(Jack<'static>:      |self: App|self.jack);
+has!(Pool:               |self: App|self.pool);
+has!(Option<Dialog>:     |self: App|self.dialog);
+has!(Clock:              |self: App|self.project.clock);
+has!(Option<MidiEditor>: |self: App|self.project.editor);
+has!(Selection:          |self: App|self.project.selection);
+has!(Vec<MidiInput>:     |self: App|self.project.midi_ins);
+has!(Vec<MidiOutput>:    |self: App|self.project.midi_outs);
+has!(Vec<Scene>:         |self: App|self.project.scenes);
+has!(Vec<Track>:         |self: App|self.project.tracks);
+has!(Measure<TuiOut>:    |self: App|self.size);
+maybe_has!(Track: |self: App|
+    { MaybeHas::<Track>::get(&self.project) };
+    { MaybeHas::<Track>::get_mut(&mut self.project) });
+impl HasTrackScroll for App { fn track_scroll (&self) -> usize { self.project.track_scroll() } }
+maybe_has!(Scene: |self: App|
+    { MaybeHas::<Scene>::get(&self.project) };
+    { MaybeHas::<Scene>::get_mut(&mut self.project) });
+impl HasSceneScroll for App { fn scene_scroll (&self) -> usize { self.project.scene_scroll() } }
+has_clips!(|self: App|self.pool.clips);
+impl HasClipsSize for App { fn clips_size (&self) -> &Measure<TuiOut> { &self.project.inner_size } }
 
-impl Configuration {
-    pub fn from_path (path: &impl AsRef<Path>, _watch: bool) -> Usually<Self> {
-        let mut config = Self { path: path.as_ref().into(), ..Default::default() };
-        let mut dsl    = read_and_leak(path.as_ref())?;
-        let mut head: Option<Arc<str>> = dsl.head()?.map(Into::into);
-        let mut tail: Option<Arc<str>> = dsl.tail()?.map(Into::into);
-        loop {
-            if let Some(exp) = head.exp()? {
-                match exp.head()?.key()? {
-                    Some("name") => match exp.tail()?.text()? {
-                        Some(name) => config.name = Some(name.into()),
-                        _ => return Err(format!("missing name definition").into())
-                    },
-                    Some("info") => match exp.tail()?.text()? {
-                        Some(info) => config.info = Some(info.into()),
-                        _ => return Err(format!("missing info definition").into())
-                    },
-                    Some("keys") => match exp.tail()? {
-                        Some(keys) => config.keys = EventMap::from_dsl(&mut &keys)?,
-                        _ => return Err(format!("missing keys definition").into())
-                    },
-                    Some("view") => match exp.tail()? {
-                        Some(tail) => config.view = tail.src().into(),
-                        _ => return Err(format!("missing view definition").into())
-                    },
-                    Some(k) => return Err(format!("(e3) unexpected key {k:?} in {exp:?}").into()),
-                    None => return Err(format!("(e2) unexpected exp {exp:?}").into()),
-                }
-            } else {
-                break
-            }
-            if let Some(next) = tail {
-                head = next.head()?.map(Into::into);
-                tail = next.tail()?.map(Into::into);
-            } else {
-                break
-            }
-        }
-        Ok(config)
-    }
-}
-
-fn read_and_leak (path: impl AsRef<Path>) -> Usually<&'static str> {
-    Ok(leak(String::from_utf8(std::fs::read(path.as_ref())?)?))
-}
-
-fn leak (x: impl AsRef<str>) -> &'static str {
-    Box::leak(x.as_ref().into())
-}
-
-fn unquote (x: &str) -> &str {
-    let mut chars = x.chars();
-    chars.next();
-    //chars.next_back();
-    chars.as_str()
-}
-
-macro_rules! default_config { ($path:literal) => { ($path, include_str!($path)) }; }
-pub const DEFAULT_CONFIGS: &'static [(&'static str, &'static str)] = &[
-    default_config!("../../../config/config_arranger.edn"),
-    default_config!("../../../config/config_groovebox.edn"),
-    default_config!("../../../config/config_sampler.edn"),
-    default_config!("../../../config/config_sequencer.edn"),
-    default_config!("../../../config/config_transport.edn"),
-
-    default_config!("../../../config/keys_arranger.edn"),
-    default_config!("../../../config/keys_clip.edn"),
-    default_config!("../../../config/keys_clock.edn"),
-    default_config!("../../../config/keys_editor.edn"),
-    default_config!("../../../config/keys_global.edn"),
-    default_config!("../../../config/keys_groovebox.edn"),
-    default_config!("../../../config/keys_length.edn"),
-    default_config!("../../../config/keys_mix.edn"),
-    default_config!("../../../config/keys_pool.edn"),
-    default_config!("../../../config/keys_pool_file.edn"),
-    default_config!("../../../config/keys_rename.edn"),
-    default_config!("../../../config/keys_sampler.edn"),
-    default_config!("../../../config/keys_scene.edn"),
-    default_config!("../../../config/keys_sequencer.edn"),
-    default_config!("../../../config/keys_track.edn"),
-];
+//take!(ClockCommand       |state: App, iter|Take::take(state.clock(), iter));
+//take!(MidiEditCommand    |state: App, iter|Ok(state.editor().map(|x|Take::take(x, iter)).transpose()?.flatten()));
+//take!(PoolCommand        |state: App, iter|Take::take(&state.pool, iter));
+//take!(SamplerCommand     |state: App, iter|Ok(state.project.sampler().map(|x|Take::take(x, iter)).transpose()?.flatten()));
+//take!(ArrangementCommand |state: App, iter|Take::take(&state.project, iter));
+//take!(DialogCommand      |state: App, iter|Take::take(&state.dialog, iter));
+//has_editor!(|self: App|{
+    //editor = self.editor;
+    //editor_w = {
+        //let size      = self.size.w();
+        //let editor    = self.editor.as_ref().expect("missing editor");
+        //let time_len  = editor.time_len().get();
+        //let time_zoom = editor.time_zoom().get().max(1);
+        //(5 + (time_len / time_zoom)).min(size.saturating_sub(20)).max(16)
+    //};
+    //editor_h = 15;
+    //is_editing = self.editor.is_some();
+//});

crates/app/src/view.rs

@@ -23,14 +23,14 @@ impl<T: Content<TuiOut>> Content<TuiOut> for ErrorBoundary<TuiOut, T> {
 }
 
 impl App {
-    pub fn view (model: &Self) -> impl Content<TuiOut> + '_ {
-        ErrorBoundary::new(Ok(Some(Tui::bg(Black, model.view_menu()))))
+    pub fn view (&self) -> impl Content<TuiOut> + '_ {
+        ErrorBoundary::new(Ok(Some(Tui::bg(Black, self.view_menu()))))
         //ErrorBoundary::new(Take::take(model, &mut model.config.view.clone()))
         //ErrorBoundary::new(Give::give(model, &mut model.config.view.clone()))
     }
 }
 
-content!(TuiOut: |self: App| ErrorBoundary::new(Ok(Some(Tui::bg(Black, self.view_nil())))));
+content!(TuiOut: |self: App| ErrorBoundary::new(Ok(Some(Tui::bg(Black, self.view())))));
 
 #[tengri_proc::view(TuiOut)]
 impl App {
@@ -39,7 +39,7 @@ impl App {
     }
     pub fn view_menu (&self) -> impl Content<TuiOut> + use<'_> {
         Stack::south(|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-            add(&Tui::bold(true, "tek"));
+            add(&Tui::bold(true, "tek 0.3.0-rc0"));
             add(&"");
             add(&"+ new session");
         })

crates/cli/tek.rs

@@ -86,9 +86,7 @@ impl Cli {
         let right_tos     = Connect::collect(&self.right_to,   empty, empty);
         let audio_froms   = &[left_froms.as_slice(), right_froms.as_slice()];
         let audio_tos     = &[left_tos.as_slice(), right_tos.as_slice()];
-        let clip = Arc::new(RwLock::new(MidiClip::new(
-            "Clip", true, 384usize, None, Some(ItemColor::random().into())),
-        ));
+        let clip          = Arc::new(RwLock::new(MidiClip::new("Clip", true, 384usize, None, Some(ItemColor::random().into()))));
         Tui::new()?.run(&Jack::new_run(&name, move|jack|{
             for (index, connect) in midi_froms.iter().enumerate() {
                 midi_ins.push(jack.midi_in(&format!("M/{index}"), &[connect.clone()])?);
@@ -96,14 +94,7 @@ impl Cli {
             for (index, connect) in midi_tos.iter().enumerate() {
                 midi_outs.push(jack.midi_out(&format!("{index}/M"), &[connect.clone()])?);
             };
-            let config = Configuration::from_path(&match self.mode {
-                LaunchMode::Clock           => "config/config_transport.edn",
-                LaunchMode::Sequencer       => "config/config_sequencer.edn",
-                LaunchMode::Groovebox       => "config/config_groovebox.edn",
-                LaunchMode::Arranger { .. } => "config/config_arranger.edn",
-                LaunchMode::Sampler         => "config/config_sampler.edn",
-                _ => todo!("{:?}", self.mode),
-            }, false)?;
+            let configs = Configurations::init();
             let clock = Clock::new(&jack, self.bpm)?;
             match self.mode {
                 LaunchMode::Sequencer => tracks.push(Track::new(
@@ -118,7 +109,7 @@ impl Cli {
             }
             let mut app = App {
                 jack:    jack.clone(),
-                config,
+                configs: Configurations::init()?,
                 color:   ItemTheme::random(),
                 pool: match self.mode {
                     LaunchMode::Sequencer | LaunchMode::Groovebox => (&clip).into(),