aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorOgulcan Celik <ogulcancelik@gmail.com>2026-05-20 00:29:53 +0300
committerOgulcan Celik <ogulcancelik@gmail.com>2026-05-20 00:34:27 +0300
commit2b97799b6715fd6c355db9c225029765971915e6 (patch)
treecb7c2c7093f439ad3460687b88c3e6cf539b64e8 /src/app
parentff8e5a14abe445a61dc200fd30a70870c75d183c (diff)
feat: add configurable default shell
refs #196
Diffstat (limited to 'src/app')
-rw-r--r--src/app/api.rs16
-rw-r--r--src/app/creation.rs2
-rw-r--r--src/app/input/mod.rs1
-rw-r--r--src/app/input/navigate.rs1
-rw-r--r--src/app/mod.rs9
-rw-r--r--src/app/state.rs2
6 files changed, 26 insertions, 5 deletions
diff --git a/src/app/api.rs b/src/app/api.rs
index ab26f82b..6eb95f03 100644
--- a/src/app/api.rs
+++ b/src/app/api.rs
@@ -637,6 +637,9 @@ impl App {
.or_else(|| std::env::current_dir().ok())
.unwrap_or_else(|| std::path::PathBuf::from("/"));
let (rows, cols) = self.state.estimate_pane_size();
+ let default_shell = self.state.default_shell.clone();
+ let scrollback_limit_bytes = self.state.pane_scrollback_limit_bytes;
+ let host_terminal_theme = self.state.host_terminal_theme;
let result = self
.state
.workspaces
@@ -647,8 +650,9 @@ impl App {
rows,
cols,
cwd,
- self.state.pane_scrollback_limit_bytes,
- self.state.host_terminal_theme,
+ scrollback_limit_bytes,
+ host_terminal_theme,
+ &default_shell,
)
});
match result {
@@ -1019,6 +1023,9 @@ impl App {
)
})
});
+ let default_shell = self.state.default_shell.clone();
+ let scrollback_limit_bytes = self.state.pane_scrollback_limit_bytes;
+ let host_terminal_theme = self.state.host_terminal_theme;
let Some(ws) = self.state.workspaces.get_mut(ws_idx) else {
return serde_json::to_string(&ErrorResponse {
id: request.id,
@@ -1043,8 +1050,9 @@ impl App {
rows,
cols,
split_cwd,
- self.state.pane_scrollback_limit_bytes,
- self.state.host_terminal_theme,
+ scrollback_limit_bytes,
+ host_terminal_theme,
+ &default_shell,
params.focus,
) {
Some(Ok(result)) => result,
diff --git a/src/app/creation.rs b/src/app/creation.rs
index f1638e15..f3d8644e 100644
--- a/src/app/creation.rs
+++ b/src/app/creation.rs
@@ -87,6 +87,7 @@ impl App {
initial_cwd,
self.state.pane_scrollback_limit_bytes,
self.state.host_terminal_theme,
+ &self.state.default_shell,
)?;
self.state
.terminal_runtimes
@@ -118,6 +119,7 @@ impl App {
cols,
self.state.pane_scrollback_limit_bytes,
self.state.host_terminal_theme,
+ &self.state.default_shell,
self.event_tx.clone(),
self.render_notify.clone(),
self.render_dirty.clone(),
diff --git a/src/app/input/mod.rs b/src/app/input/mod.rs
index ad68f9da..4cafc926 100644
--- a/src/app/input/mod.rs
+++ b/src/app/input/mod.rs
@@ -259,6 +259,7 @@ impl AppState {
cwd,
self.pane_scrollback_limit_bytes,
self.host_terminal_theme,
+ &self.default_shell,
) {
let new_id = new_pane.pane_id;
self.terminal_runtimes
diff --git a/src/app/input/navigate.rs b/src/app/input/navigate.rs
index 34d0a342..a2967ca3 100644
--- a/src/app/input/navigate.rs
+++ b/src/app/input/navigate.rs
@@ -1092,6 +1092,7 @@ mod tests {
80,
app.state.pane_scrollback_limit_bytes,
app.state.host_terminal_theme,
+ &app.state.default_shell,
app.event_tx.clone(),
app.render_notify.clone(),
app.render_dirty.clone(),
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 3e8a8b83..ca053ba1 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -234,6 +234,7 @@ impl App {
24,
80,
config.advanced.scrollback_limit_bytes,
+ &config.terminal.default_shell,
event_tx.clone(),
render_notify.clone(),
render_dirty.clone(),
@@ -412,6 +413,7 @@ impl App {
prompt_new_tab_name: config.ui.prompt_new_tab_name,
show_agent_labels_on_pane_borders: config.ui.show_agent_labels_on_pane_borders,
kitty_graphics_enabled: config.experimental.kitty_graphics,
+ default_shell: config.terminal.default_shell.clone(),
pane_scrollback_limit_bytes: config.advanced.scrollback_limit_bytes,
accent: crate::config::parse_color(&config.ui.accent),
sound: config.ui.sound.clone(),
@@ -891,6 +893,10 @@ impl App {
self.state.pane_scrollback_limit_bytes = config.advanced.scrollback_limit_bytes;
}
+ if !invalid_section("terminal") {
+ self.state.default_shell = config.terminal.default_shell.clone();
+ }
+
if !invalid_section("theme") {
self.state.palette = resolve_palette_with_legacy_accent(config, !invalid_section("ui"));
self.state.theme_name = config
@@ -1321,7 +1327,7 @@ mod tests {
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
std::fs::write(
&path,
- "[keys]\nnew_workspace = \"g\"\nprefix = \"ctrl+a\"\n[ui]\nagent_panel_scope = \"current\"\n[ui.toast]\ndelivery = \"herdr\"\n",
+ "[terminal]\ndefault_shell = \"nu\"\n[keys]\nnew_workspace = \"g\"\nprefix = \"ctrl+a\"\n[ui]\nagent_panel_scope = \"current\"\n[ui.toast]\ndelivery = \"herdr\"\n",
)
.unwrap();
std::env::set_var(crate::config::CONFIG_PATH_ENV_VAR, &path);
@@ -1344,6 +1350,7 @@ mod tests {
app.state.agent_panel_scope,
state::AgentPanelScope::CurrentWorkspace
);
+ assert_eq!(app.state.default_shell, "nu");
assert!(app.state.config_diagnostic.is_none());
let toast = app.state.toast.as_ref().unwrap();
assert_eq!(toast.kind, crate::app::state::ToastKind::UpdateInstalled);
diff --git a/src/app/state.rs b/src/app/state.rs
index 746474df..0c38171d 100644
--- a/src/app/state.rs
+++ b/src/app/state.rs
@@ -965,6 +965,7 @@ pub struct AppState {
pub prompt_new_tab_name: bool,
pub show_agent_labels_on_pane_borders: bool,
pub kitty_graphics_enabled: bool,
+ pub default_shell: String,
pub pane_scrollback_limit_bytes: usize,
#[allow(dead_code)] // kept for backward compat; palette.accent is the source of truth
pub accent: Color,
@@ -1211,6 +1212,7 @@ impl AppState {
prompt_new_tab_name: true,
show_agent_labels_on_pane_borders: false,
kitty_graphics_enabled: false,
+ default_shell: String::new(),
pane_scrollback_limit_bytes: crate::config::DEFAULT_SCROLLBACK_LIMIT_BYTES,
accent: Color::Cyan,
sound: SoundConfig {