diff --git a/.scatterer.toml.example b/.scatterer.toml.example index 43a8dee..7d18658 100644 --- a/.scatterer.toml.example +++ b/.scatterer.toml.example @@ -3,7 +3,7 @@ agent = "pi" # Tab 1, right pane -hunk = "hunk" +hunk = "hunk diff main" # Tab 2 runner = "process-compose up" diff --git a/README.md b/README.md index 6c4c03a..6280e80 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,18 @@ Personal Herdr workflow plugin. The `daniel.scatterer.apply-layout` action creates a new Herdr workspace/space from the currently focused pane's cwd, then uses Herdr's declarative `layout.apply` socket API to make an `agent` tab with `pi` on the left and -`hunk` on the right. +`hunk diff main` on the right. Repeated invocations create another workspace/space. It does not append tabs to -the workspace you invoked it from. Project config can add extra layout tabs such -as a runner or git UI. +the workspace you invoked it from. Project config can override the Hunk command +or add extra layout tabs such as a runner or git UI. + +Hunk theming is best configured through Hunk itself. `theme = "auto"` queries the +terminal background and picks Hunk's light/dark defaults; `transparent_background += true` lets the terminal background show through. Hunk also has a `tokyo-night` +dark theme, but not a matching Tokyo Night Day theme. Herdr itself supports +`name = "terminal"` or `dark_name = "tokyo-night"` / `light_name = +"tokyo-night-day"` in `~/.config/herdr/config.toml`. ## Quick start @@ -222,7 +229,7 @@ direnv = true [layout] agent = "pi" -hunk = "hunk" +hunk = "hunk diff main" # Optional per-project tabs. Defaults do not include process-compose or lazygit. runner = "process-compose up" git = "lazygit" diff --git a/herdr-plugin.toml b/herdr-plugin.toml index 9e9faf0..c781080 100644 --- a/herdr-plugin.toml +++ b/herdr-plugin.toml @@ -1,6 +1,6 @@ id = "daniel.scatterer" name = "Scatterer" -version = "0.1.9" +version = "0.1.10" min_herdr_version = "0.7.0" description = "Daniel's Herdr workflow/layout plugin." platforms = ["macos", "linux"] diff --git a/src/layout.rs b/src/layout.rs index d29a10d..ff685e1 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -58,7 +58,7 @@ pub(crate) fn apply_scatterer_layout( ); let agent = agent_override.unwrap_or(agent_default); let hunk = config.layout.hunk.as_deref().unwrap_or( - "if command -v hunk >/dev/null 2>&1; then hunk; else echo 'hunk not found on PATH'; fi", + "if command -v hunk >/dev/null 2>&1; then hunk diff main; else echo 'hunk not found on PATH'; fi", ); let runner = optional_command(config.layout.runner.as_deref()); let git = optional_command(config.layout.git.as_deref());