diff --git a/.config/config.ron b/.config/config.ron index 488ca47..4d4a2fb 100644 --- a/.config/config.ron +++ b/.config/config.ron @@ -1,18 +1,18 @@ ( directory: "/Users/suri/dev/projects/filaments/ZettelKasten", global_key_binds: { - "ctrl-c": Quit, "ctrl-z": Suspend, "up": MoveUp, + "ctrl-c": Quit, "down": MoveDown, }, zk: ( keybinds: { + "enter": OpenZettel, + "ctrl-n": NewZettel, "tab": SwitchTo( page: Todo(Explorer), ), - "ctrl-n": NewZettel, - "enter": OpenZettel, }, ), todo: ( @@ -21,66 +21,66 @@ "1": SwitchTo( page: Todo(Explorer), ), - "t": NewTask, - "k": MoveUp, - "shift-g": NewGroup, - "enter": SwitchTo( - page: Todo(Inspector), - ), "2": SwitchTo( page: Todo(Inspector), ), - "tab": SwitchTo( - page: Zk, - ), + "shift-g": NewGroup, "3": SwitchTo( page: Todo(TaskList), ), "j": MoveDown, "g": NewSubGroup, + "t": NewTask, + "enter": SwitchTo( + page: Todo(Inspector), + ), + "k": MoveUp, + "tab": SwitchTo( + page: Zk, + ), }, ), inspector: ( keybinds: { + "d": EditDue, + "r": RandomColor, "3": SwitchTo( page: Todo(TaskList), ), "tab": SwitchTo( page: Zk, ), - "f": ToggleFinish, - "r": RandomColor, - "1": SwitchTo( - page: Todo(Explorer), - ), + "n": EditName, "2": SwitchTo( page: Todo(Inspector), ), - "n": EditName, - "p": EditPriority, + "1": SwitchTo( + page: Todo(Explorer), + ), "o": OpenZettel, - "d": EditDue, + "f": ToggleFinish, + "p": EditPriority, }, ), tasklist: ( keybinds: { + "k": MoveUp, + "j": MoveDown, + "enter": SwitchTo( + page: Todo(Inspector), + ), "tab": SwitchTo( page: Zk, ), "3": SwitchTo( page: Todo(TaskList), ), - "2": SwitchTo( - page: Todo(Inspector), - ), - "j": MoveDown, - "enter": SwitchTo( - page: Todo(Inspector), - ), - "k": MoveUp, "1": SwitchTo( page: Todo(Explorer), ), + "2": SwitchTo( + page: Todo(Inspector), + ), }, ), ), diff --git a/crates/fil-core/src/zettel/id.rs b/crates/fil-core/src/zettel/id.rs index 772c6e0..c9921fc 100644 --- a/crates/fil-core/src/zettel/id.rs +++ b/crates/fil-core/src/zettel/id.rs @@ -59,17 +59,11 @@ impl TryFrom<&Path> for ZettelId { return Err(invalid("expected .md extension")); } - let stem = value + let id = value .file_stem() .and_then(|stem| stem.to_str()) .ok_or_else(|| invalid("missing file stem! "))?; - let id = stem - .split('-') - .next() - .filter(|id| id.is_empty()) - .ok_or_else(|| invalid("missing id before first dash"))?; - Ok(Self(id.into())) } } diff --git a/src/lsp/mod.rs b/src/lsp/mod.rs index 6053e22..a4125ba 100644 --- a/src/lsp/mod.rs +++ b/src/lsp/mod.rs @@ -1,6 +1,5 @@ use std::fs; -use color_eyre::eyre::eyre; use dto::{NanoId, TagEntity, ZettelEntity}; use fil_core::{Kasten, Tag, Zettel, ZettelId}; use tower_lsp::{