feat: make UI extensions easier (#1257)

Author: sxyazi

Cargo.lock

@@ -15,12 +15,12 @@ yazi-config  = { path = "../yazi-config", version = "0.2.5" }
 yazi-shared  = { path = "../yazi-shared", version = "0.2.5" }
 
 # External dependencies
-clap  = { version = "4.5.7", features = [ "derive" ] }
-serde = { version = "1.0.203", features = [ "derive" ] }
+clap  = { version = "4.5.9", features = [ "derive" ] }
+serde = { version = "1.0.204", features = [ "derive" ] }
 
 [build-dependencies]
-clap                  = { version = "4.5.7", features = [ "derive" ] }
-clap_complete         = "4.5.6"
-clap_complete_nushell = "4.5.2"
+clap                  = { version = "4.5.9", features = [ "derive" ] }
+clap_complete         = "4.5.8"
 clap_complete_fig     = "4.5.1"
-vergen                = { version = "8.3.1", features = [ "build", "git", "gitcl" ] }
+clap_complete_nushell = "4.5.2"
+vergen-gitcl          = { version = "1.0.0", features = [ "build" ] }

yazi-boot/Cargo.toml

@@ -5,10 +5,13 @@ use std::{env, error::Error};
 
 use clap::CommandFactory;
 use clap_complete::{generate_to, Shell};
-use vergen::EmitBuilder;
+use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder};
 
 fn main() -> Result<(), Box<dyn Error>> {
-	EmitBuilder::builder().build_date().git_sha(true).emit()?;
+	Emitter::default()
+		.add_instructions(&BuildBuilder::default().build_date(true).build()?)?
+		.add_instructions(&GitclBuilder::default().commit_date(true).sha(true).build()?)?
+		.emit()?;
 
 	if env::var_os("YAZI_GEN_COMPLETIONS").is_none() {
 		return Ok(());

yazi-boot/build.rs

@@ -14,21 +14,21 @@ yazi-shared = { path = "../yazi-shared", version = "0.2.5" }
 
 # External dependencies
 anyhow     = "1.0.86"
-clap       = { version = "4.5.7", features = [ "derive" ] }
+clap       = { version = "4.5.9", features = [ "derive" ] }
 crossterm  = "0.27.0"
 md-5       = "0.10.6"
-serde_json = "1.0.117"
+serde_json = "1.0.120"
 tokio      = { version = "1.38.0", features = [ "full" ] }
-toml_edit  = "0.22.14"
+toml_edit  = "0.22.15"
 
 [build-dependencies]
 anyhow                = "1.0.86"
-clap                  = { version = "4.5.7", features = [ "derive" ] }
-clap_complete         = "4.5.6"
+clap                  = { version = "4.5.9", features = [ "derive" ] }
+clap_complete         = "4.5.8"
 clap_complete_fig     = "4.5.1"
 clap_complete_nushell = "4.5.2"
-serde_json            = "1.0.117"
-vergen                = { version = "8.3.1", features = [ "build", "git", "gitcl" ] }
+serde_json            = "1.0.120"
+vergen-gitcl          = { version = "1.0.0", features = [ "build" ] }
 
 [[bin]]
 name = "ya"

yazi-cli/Cargo.toml

@@ -5,10 +5,13 @@ use std::{env, error::Error};
 
 use clap::CommandFactory;
 use clap_complete::{generate_to, Shell};
-use vergen::EmitBuilder;
+use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder};
 
 fn main() -> Result<(), Box<dyn Error>> {
-	EmitBuilder::builder().build_date().git_sha(true).emit()?;
+	Emitter::default()
+		.add_instructions(&BuildBuilder::default().build_date(true).build()?)?
+		.add_instructions(&GitclBuilder::default().commit_date(true).sha(true).build()?)?
+		.emit()?;
 
 	if env::var_os("YAZI_GEN_COMPLETIONS").is_none() {
 		return Ok(());

yazi-cli/build.rs

@@ -14,11 +14,11 @@ yazi-shared = { path = "../yazi-shared", version = "0.2.5" }
 # External dependencies
 anyhow      = "1.0.86"
 arc-swap    = "1.7.1"
-bitflags    = "2.5.0"
+bitflags    = "2.6.0"
 crossterm   = "0.27.0"
 globset     = "0.4.14"
 indexmap    = "2.2.6"
 ratatui     = "0.27.0"
-serde       = { version = "1.0.203", features = [ "derive" ] }
+serde       = { version = "1.0.204", features = [ "derive" ] }
 toml        = { version = "0.8.14", features = [ "preserve_order" ] }
 validator   = { version = "0.18.1", features = [ "derive" ] }

yazi-config/Cargo.toml

@@ -773,9 +773,9 @@ conds = [
 	{ if = "sticky", text = "" },
 
 	# Fallback
-	{ if = "dir", text = "" },
-	{ if = "exec", text = "" },
-	{ if = "!dir", text = "" },
+	{ if = "dir", text = "󰉋" },
+	{ if = "exec", text = "" },
+	{ if = "!dir", text = "󰈔" },
 ]
 
 # : }}}

yazi-config/preset/theme.toml

@@ -122,7 +122,7 @@ previewers = [
 ]
 
 [input]
-cursor_blink = true
+cursor_blink = false
 
 # cd
 cd_title  = "Change directory:"

yazi-config/preset/yazi.toml

@@ -1,12 +1,7 @@
 use ratatui::layout::Rect;
 
-#[derive(Default)]
+#[derive(Clone, Copy, Default)]
 pub struct Layout {
-	pub header: Rect,
-
-	pub parent:  Rect,
 	pub current: Rect,
 	pub preview: Rect,
-
-	pub status: Rect,
 }

yazi-config/src/layout.rs

@@ -61,13 +61,20 @@ pub fn init() -> anyhow::Result<()> {
 	// TODO: Remove in v0.3.2
 	for c in &KEYMAP.manager {
 		for r in &c.run {
-			if r.name == "shell" && !r.bool("confirm") && !r.bool("interactive") {
+			if r.name != "shell" {
+				continue;
+			}
+			if !r.bool("confirm") && !r.bool("interactive") {
 				eprintln!(
 					r#"WARNING: In Yazi v0.3, the behavior of the interactive `shell` (i.e., shell templates) must be explicitly specified with `--interactive`.
 
 Please replace e.g. `shell` with `shell --interactive`, `shell "my-template"` with `shell "my-template" --interactive`, in your keymap.toml"#
 				);
 				return Ok(());
+			} else if r.bool("confirm") && r.bool("interactive") {
+				eprintln!(
+					"The `shell` command cannot specify both `--confirm` and `--interactive` at the same time.",
+				);
 			}
 		}
 	}