hl-valdemar/tinty-wrapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

refactor: rename the bundled theme to Pumpkin

Browse Source
This commit is contained in:
hl-valdemar
2026-10-23 11:19:44 +02:00
parent 08135a407b
commit 4136aa53c8
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -3
View File
@@ -70,18 +70,18 @@ install: default-state.toml config.toml
@launchctl bootout "gui/$$(id -u)/$(LAUNCH_AGENT_LABEL)" 2>/dev/null || true @launchctl bootout "gui/$$(id -u)/$(LAUNCH_AGENT_LABEL)" 2>/dev/null || true
launchctl bootstrap "gui/$$(id -u)" "$(LAUNCH_AGENT)" launchctl bootstrap "gui/$$(id -u)" "$(LAUNCH_AGENT)"
install-schemes: schemes/base16/terebi-sunset.yaml install-schemes: schemes/base16/pumpkin.yaml
@set -e; \ @set -e; \
data_dir="$$(XDG_CONFIG_HOME="$(XDG_CONFIG_HOME)" tinty config --data-dir-path)"; \ data_dir="$$(XDG_CONFIG_HOME="$(XDG_CONFIG_HOME)" tinty config --data-dir-path)"; \
mkdir -p "$$data_dir/custom-schemes/base16"; \ mkdir -p "$$data_dir/custom-schemes/base16"; \
cp schemes/base16/terebi-sunset.yaml "$$data_dir/custom-schemes/base16/terebi-sunset.yaml" cp schemes/base16/pumpkin.yaml "$$data_dir/custom-schemes/base16/pumpkin.yaml"
uninstall: uninstall:
@launchctl bootout "gui/$$(id -u)/$(LAUNCH_AGENT_LABEL)" 2>/dev/null || true @launchctl bootout "gui/$$(id -u)/$(LAUNCH_AGENT_LABEL)" 2>/dev/null || true
rm -f "$(BIN_DIR)/tint" "$(LAUNCH_AGENT)" "$(DARK_NOTIFY_LOG)" rm -f "$(BIN_DIR)/tint" "$(LAUNCH_AGENT)" "$(DARK_NOTIFY_LOG)"
@if command -v tinty >/dev/null; then \ @if command -v tinty >/dev/null; then \
data_dir="$$(XDG_CONFIG_HOME="$(XDG_CONFIG_HOME)" tinty config --data-dir-path)" && \ data_dir="$$(XDG_CONFIG_HOME="$(XDG_CONFIG_HOME)" tinty config --data-dir-path)" && \
rm -f "$$data_dir/custom-schemes/base16/terebi-sunset.yaml"; \ rm -f "$$data_dir/custom-schemes/base16/pumpkin.yaml"; \
fi fi
@if [ -e "$(STATE_MARKER)" ]; then \ @if [ -e "$(STATE_MARKER)" ]; then \
rm -f "$(CONFIG_DIR)/state.toml" "$(STATE_MARKER)"; \ rm -f "$(CONFIG_DIR)/state.toml" "$(STATE_MARKER)"; \
README.md
+5 -5
View File
@@ -173,22 +173,22 @@ TINTY_PAIR_APPEARANCE=light tint swamp
TINTY_PAIR_APPEARANCE=dark tint swamp TINTY_PAIR_APPEARANCE=dark tint swamp
``` ```
### Terebi Sunset ### Pumpkin
The bundled [`base16-terebi-sunset`](schemes/base16/terebi-sunset.yaml) palette comes from the sibling Terebi project. It preserves the player's brown, cream, sand, orange and ember colors and adds the remaining Base16 syntax hues. It is dark-only; keep your existing light theme. The bundled [`base16-pumpkin`](schemes/base16/pumpkin.yaml) palette comes from the sibling Terebi project. It preserves the player's brown, cream, sand, orange and ember colors and adds the remaining Base16 syntax hues. It is dark-only; keep your existing light theme.
`make install` installs it automatically. To install just the palette and updated wrapper without syncing repositories or reloading the appearance agent: `make install` installs it automatically. To install just the palette and updated wrapper without syncing repositories or reloading the appearance agent:
```sh ```sh
make install-schemes make install-schemes
go build -o "$HOME/.local/bin/tint" . go build -o "$HOME/.local/bin/tint" .
tint favorite base16-terebi-sunset tint favorite base16-pumpkin
tint dark:base16-terebi-sunset tint dark:base16-pumpkin
``` ```
Setting the dark side preserves the light side and applies whichever side matches macOS appearance. Use `tint dark` to apply the saved dark side immediately. Setting the dark side preserves the light side and applies whichever side matches macOS appearance. Use `tint dark` to apply the saved dark side immediately.
Tinty stores the YAML under `$(tinty config --data-dir-path)/custom-schemes/base16/terebi-sunset.yaml` and builds the installed app templates when applying it. Both theme validation and app palette lookup support [Tinty's native custom schemes](https://github.com/tinted-theming/tinty/blob/v0.34.0/USAGE.md#use-your-own-schemes), so Ghostty, Zed, Herdr, OMP and Conjure use the normal application flow. List local palettes with `tinty list --custom-schemes`. Reinstalling updates the bundled palette without changing the saved pair or favorites; uninstalling removes the bundled YAML. Tinty stores the YAML under `$(tinty config --data-dir-path)/custom-schemes/base16/pumpkin.yaml` and builds the installed app templates when applying it. Both theme validation and app palette lookup support [Tinty's native custom schemes](https://github.com/tinted-theming/tinty/blob/v0.34.0/USAGE.md#use-your-own-schemes), so Ghostty, Zed, Herdr, OMP and Conjure use the normal application flow. List local palettes with `tinty list --custom-schemes`. Reinstalling updates the bundled palette without changing the saved pair or favorites; uninstalling removes the bundled YAML.
## Update ## Update
custom_scheme_test.go
+6 -6
View File
@@ -22,15 +22,15 @@ func TestCustomSchemeCanBeFavoritedAndAppliedToApps(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
} }
palette, err := os.ReadFile("schemes/base16/terebi-sunset.yaml") palette, err := os.ReadFile("schemes/base16/pumpkin.yaml")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
files := map[string][]byte{ files := map[string][]byte{
filepath.Join(data, "custom-schemes", "base16", "terebi-sunset.yaml"): palette, filepath.Join(data, "custom-schemes", "base16", "pumpkin.yaml"): palette,
filepath.Join(home, "config.toml"): []byte("items = []\n"), filepath.Join(home, "config.toml"): []byte("items = []\n"),
filepath.Join(home, ".config", "herdr", "config.toml"): []byte("[server]\nport = 8080\n"), filepath.Join(home, ".config", "herdr", "config.toml"): []byte("[server]\nport = 8080\n"),
filepath.Join(home, "zed.json"): []byte(`{"name":"Terebi Sunset","themes":[{"name":"Terebi Sunset","appearance":"dark"}]}`), filepath.Join(home, "zed.json"): []byte(`{"name":"Pumpkin","themes":[{"name":"Pumpkin","appearance":"dark"}]}`),
} }
for path, contents := range files { for path, contents := range files {
if err := os.WriteFile(path, contents, 0o644); err != nil { if err := os.WriteFile(path, contents, 0o644); err != nil {
@@ -53,14 +53,14 @@ exec "$TINTY_TEST_BINARY" --data-dir "$TINTY_TEST_DATA" --config "$TINTY_TEST_CO
t.Fatal(err) t.Fatal(err)
} }
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
if err := runCLI([]string{"favorite", "base16-terebi-sunset"}, &stdout, &stderr); err != nil { if err := runCLI([]string{"favorite", "base16-pumpkin"}, &stdout, &stderr); err != nil {
t.Fatalf("custom scheme could not be favorited: %v: %s", err, stderr.String()) t.Fatalf("custom scheme could not be favorited: %v: %s", err, stderr.String())
} }
value, err := loadState(statePath) value, err := loadState(statePath)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if value.Current != initial.Current || len(value.Catalog.FavoriteThemes) != 1 || value.Catalog.FavoriteThemes[0] != "base16-terebi-sunset" { if value.Current != initial.Current || len(value.Catalog.FavoriteThemes) != 1 || value.Catalog.FavoriteThemes[0] != "base16-pumpkin" {
t.Fatalf("favorite changed the current pair or omitted the scheme: %#v", value) t.Fatalf("favorite changed the current pair or omitted the scheme: %#v", value)
} }
before := readFile(t, statePath) before := readFile(t, statePath)
@@ -70,7 +70,7 @@ exec "$TINTY_TEST_BINARY" --data-dir "$TINTY_TEST_DATA" --config "$TINTY_TEST_CO
if readFile(t, statePath) != before { if readFile(t, statePath) != before {
t.Fatal("invalid scheme changed saved state") t.Fatal("invalid scheme changed saved state")
} }
if output, err := exec.Command("tinty", "apply", "base16-terebi-sunset").CombinedOutput(); err != nil { if output, err := exec.Command("tinty", "apply", "base16-pumpkin").CombinedOutput(); err != nil {
t.Fatalf("Tinty could not apply the custom scheme: %v\n%s", err, output) t.Fatalf("Tinty could not apply the custom scheme: %v\n%s", err, output)
} }
if err := applyApps(filepath.Join(home, "zed.json")); err != nil { if err := applyApps(filepath.Join(home, "zed.json")); err != nil {
default-state.toml
+1 -1
View File
@@ -37,7 +37,7 @@ themes = [
"base16-selenized-light", "base16-selenized-light",
"base16-swamp-dark", "base16-swamp-dark",
"base16-swamp-light", "base16-swamp-light",
"base16-terebi-sunset", "base16-pumpkin",
"base24-ic-orange-ppl", "base24-ic-orange-ppl",
"base24-later-this-evening", "base24-later-this-evening",
"tinted8-gruvbox-dark", "tinted8-gruvbox-dark",
schemes/base16/terebi-sunset.yaml → schemes/base16/pumpkin.yaml
+2 -2
View File
@@ -1,8 +1,8 @@
# Palette source: terebi/Themes/terebi-sunset.yaml (sibling project). # Palette source: terebi/Themes/pumpkin.yaml (sibling project).
# App colors are rounded to 8-bit sRGB; the translucent backdrop becomes opaque. # App colors are rounded to 8-bit sRGB; the translucent backdrop becomes opaque.
# Styling roles: https://github.com/tinted-theming/home/blob/main/styling.md # Styling roles: https://github.com/tinted-theming/home/blob/main/styling.md
system: "base16" system: "base16"
name: "Terebi Sunset" name: "Pumpkin"
author: "Terebi" author: "Terebi"
variant: "dark" variant: "dark"
palette: palette: