Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scatterer.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
agent = "pi"

# Tab 1, right pane
hunk = "hunk"
hunk = "hunk diff main"

# Tab 2
runner = "process-compose up"
Expand Down
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion herdr-plugin.toml
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading