Add as_omarchy_theme= to aether:// for one-click Omarchy theme installs

aether://apply?colors=URL&wallpaper=URL&as_omarchy_theme=nord renders the
imported palette + wallpaper into ~/.config/omarchy/themes/nord/ as a full
theme bundle (colors.toml, backgrounds/, per-app templates) and runs
omarchy-theme-set nord. Theme persists in the Omarchy picker.

Name is validated against [A-Za-z0-9][A-Za-z0-9_.-]* so it's safe as both
a filesystem path and an argv argument. Errors out if omarchy-theme-set
isn't on PATH. Always silent — installing into the system themes dir is
the publisher's consent action.

Author: bjarneo

cli/cli.go

@@ -156,6 +156,8 @@ Import commands:
                                               aether://apply?colors=URL
                                               aether://apply?wallpaper=URL
                                               aether://apply?mode=light|dark
+                                              aether://apply?silent=true
+                                              aether://apply?as_omarchy_theme=NAME
 
 Color utilities:
   aether --color-info <hex>                 Show all color representations

cli/url_handler.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
 
@@ -19,6 +20,11 @@ import (
 	"aether/ipc"
 )
 
+// safeThemeName allows only filename-friendly characters in an omarchy theme
+// name. Reject path separators and shell metachars; the name is used both as
+// a directory name and as an argument to omarchy-theme-set.
+var safeThemeName = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9_.-]{0,63}$`)
+
 // runHandleURL parses an aether:// URL, downloads any referenced HTTPS assets,
 // and either hands them to a running GUI (via IPC) or stages them in the
 // pending-import file and launches the GUI.
@@ -92,12 +98,26 @@ func runHandleURL(args []string, templatesFS embed.FS) int {
 	if v := strings.ToLower(q.Get("silent")); v == "true" || v == "1" || v == "yes" {
 		imp.Silent = true
 	}
+	if v := q.Get("as_omarchy_theme"); v != "" {
+		if !safeThemeName.MatchString(v) {
+			fmt.Fprintf(os.Stderr, "Error: as_omarchy_theme must match [A-Za-z0-9][A-Za-z0-9_.-]* (got %q)\n", v)
+			return 1
+		}
+		imp.OmarchyThemeName = v
+	}
 
 	if imp.ExternalTheme == "" && imp.ColorsToml == "" && imp.Wallpaper == "" {
 		fmt.Fprintln(os.Stderr, "Error: URL has no external_theme=, colors=, or wallpaper= parameter")
 		return 1
 	}
 
+	// Omarchy install: drop files into ~/.config/omarchy/themes/<name>/ and
+	// run omarchy-theme-set. Always silent — installing into a system
+	// location is the consent action by the publisher.
+	if imp.OmarchyThemeName != "" {
+		return runOmarchyInstall(&imp, templatesFS)
+	}
+
 	// Silent mode: apply directly in this process, no GUI, no dialog.
 	// Matches `aether --import-colors-toml` semantics — first-party flows
 	// only, since any web page can construct silent URLs.
@@ -217,3 +237,105 @@ func runSilentApply(imp *pending.Import, templatesFS embed.FS) int {
 	_ = pending.Clear() // best-effort cleanup of any prior staged file
 	return 0
 }
+
+// runOmarchyInstall renders the imported theme directly into
+// ~/.config/omarchy/themes/<name>/ — colors.toml + backgrounds/<wp> + all
+// the per-app templates — and then runs `omarchy-theme-set <name>`. The
+// theme name has already been validated against safeThemeName, so it's safe
+// to use as both a filesystem path component and an argv argument.
+func runOmarchyInstall(imp *pending.Import, templatesFS embed.FS) int {
+	if !theme.IsOmarchyInstalled() {
+		fmt.Fprintln(os.Stderr, "Error: omarchy-theme-set not found in PATH; cannot install as an omarchy theme")
+		return 1
+	}
+
+	var palette [16]string
+	var bp *blueprint.Blueprint
+	var err error
+
+	switch {
+	case imp.ExternalTheme != "":
+		bp, err = blueprint.ImportJSON(imp.ExternalTheme)
+	case imp.ColorsToml != "":
+		bp, err = blueprint.ImportColorsToml(imp.ColorsToml)
+	}
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: parse: %v\n", err)
+		return 1
+	}
+
+	extended := map[string]string{}
+	if bp != nil {
+		for i := 0; i < 16 && i < len(bp.Palette.Colors); i++ {
+			palette[i] = bp.Palette.Colors[i]
+		}
+		for k, v := range bp.Palette.ExtendedColors {
+			extended[k] = v
+		}
+	} else {
+		// Wallpaper-only install: borrow the palette from the currently
+		// applied colors.toml so the rendered theme isn't blank.
+		existing := filepath.Join(platform.ThemeDir(), "colors.toml")
+		if data, err := os.ReadFile(existing); err == nil {
+			current, bg, fg := omarchy.ParseColorsToml(string(data))
+			palette = current
+			if bg != "" {
+				extended["background"] = bg
+			}
+			if fg != "" {
+				extended["foreground"] = fg
+			}
+		}
+	}
+
+	if !paletteHasColors(palette) {
+		fmt.Fprintln(os.Stderr, "Error: no palette to install (URL had no colors/external_theme and no existing colors.toml to borrow from)")
+		return 1
+	}
+
+	lightMode := imp.Mode == "light"
+
+	targetDir := filepath.Join(platform.OmarchyThemesDir(), imp.OmarchyThemeName)
+	if err := platform.EnsureDir(targetDir); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: create theme dir: %v\n", err)
+		return 1
+	}
+
+	colorRoles := MapColorsToRoles(palette)
+	writer := theme.NewWriter(templatesFS, "templates")
+	state := &theme.ThemeState{
+		Palette:        palette,
+		WallpaperPath:  imp.Wallpaper,
+		LightMode:      lightMode,
+		ColorRoles:     colorRoles,
+		ExtendedColors: extended,
+	}
+
+	fmt.Printf("Installing omarchy theme %q to: %s\n", imp.OmarchyThemeName, targetDir)
+	if err := writer.GenerateOnly(state, theme.Settings{}, targetDir); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: render templates: %v\n", err)
+		return 1
+	}
+
+	fmt.Printf("Activating: omarchy-theme-set %s\n", imp.OmarchyThemeName)
+	if out, err := platform.RunSync("omarchy-theme-set", imp.OmarchyThemeName); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: omarchy-theme-set failed: %v\n", err)
+		if out != "" {
+			fmt.Fprintln(os.Stderr, out)
+		}
+		return 1
+	}
+
+	fmt.Println("Omarchy theme installed and activated")
+	return 0
+}
+
+// paletteHasColors reports whether a palette has at least one non-empty slot.
+func paletteHasColors(p [16]string) bool {
+	for _, c := range p {
+		if c != "" {
+			return true
+		}
+	}
+	return false
+}

docs/web-handler.md

@@ -17,6 +17,7 @@ aether://apply?<param>=<https-url>[&<param>=<https-url>...]
 | `wallpaper` | URL to an image | Sets the wallpaper (no re-extraction, even when used alone) |
 | `mode` | `light` or `dark` | Forces Aether into light or dark mode before applying. Omit to keep the current setting. |
 | `silent` | `true` | Skips the confirm dialog and applies immediately. Use with care: any web page can construct this URL. |
+| `as_omarchy_theme` | theme name | Installs into `~/.config/omarchy/themes/<name>/` and runs `omarchy-theme-set <name>`. Always silent. Name must match `[A-Za-z0-9][A-Za-z0-9_.-]*`. |
 
 `external_theme` and `colors` are mutually exclusive; `external_theme` wins when both are present. `wallpaper` can be combined with either, or used alone. `mode` and `silent` can be combined with any of the above.
 
@@ -52,6 +53,12 @@ Silent apply (no dialog) — for one-click flows where the user has already opte
 aether://apply?colors=https://themes.example.com/nord/colors.toml&wallpaper=https://themes.example.com/nord/wp.jpg&silent=true
 ```
 
+Install as a named Omarchy theme and activate it:
+
+```
+aether://apply?colors=https://themes.example.com/nord/colors.toml&wallpaper=https://themes.example.com/nord/wp.jpg&as_omarchy_theme=nord
+```
+
 ## HTML button
 
 ```html
@@ -75,6 +82,14 @@ URL-encode any values containing `&`, `?`, `=`, or spaces.
 
 If Aether is closed when the link is clicked, the launch is automatic and the dialog appears once the GUI is ready.
 
+### `as_omarchy_theme=NAME` — install as an Omarchy theme
+
+Renders the imported palette + wallpaper into `~/.config/omarchy/themes/<name>/` as a real Omarchy theme bundle (colors.toml, backgrounds/, plus all the per-app templates Aether normally writes), then runs `omarchy-theme-set <name>` to activate it. The theme persists in the Omarchy picker and can be re-selected later.
+
+Always silent — installing into the system themes directory is the publisher's consent action. The name is restricted to `[A-Za-z0-9][A-Za-z0-9_.-]*` (max 64 chars) so it can be used as both a filesystem path and an argv argument. Requires `omarchy-theme-set` on PATH; the CLI errors out otherwise.
+
+Wallpaper-only `as_omarchy_theme` installs borrow the currently applied palette from `~/.config/aether/theme/colors.toml` so the rendered bundle isn't blank.
+
 ### `silent=true` — apply without confirming
 
 `silent=true` makes the click apply immediately, no dialog. The URL handler runs the apply *itself*, in the same process — same code path as `aether --import-colors-toml URL`. No GUI is launched and no IPC happens; this works identically whether or not the Aether GUI is running. The downloaded files still land in `~/.cache/aether/web-imports/`, but the staging file and confirmation step are skipped.

internal/pending/pending.go

@@ -17,13 +17,14 @@ import (
 // All paths are local cache paths, populated by the URL handler after the
 // originating HTTPS resources have been downloaded.
 type Import struct {
-	ExternalTheme string `json:"external_theme,omitempty"`
-	ColorsToml    string `json:"colors_toml,omitempty"`
-	Wallpaper     string `json:"wallpaper,omitempty"`
-	Mode          string `json:"mode,omitempty"`   // "light" | "dark" — empty leaves the current setting alone
-	Silent        bool   `json:"silent,omitempty"` // skip the confirm dialog and apply immediately
-	SourceURL     string `json:"source_url,omitempty"`
-	Timestamp     int64  `json:"ts,omitempty"`
+	ExternalTheme    string `json:"external_theme,omitempty"`
+	ColorsToml       string `json:"colors_toml,omitempty"`
+	Wallpaper        string `json:"wallpaper,omitempty"`
+	Mode             string `json:"mode,omitempty"`               // "light" | "dark" — empty leaves the current setting alone
+	Silent           bool   `json:"silent,omitempty"`             // skip the confirm dialog and apply immediately
+	OmarchyThemeName string `json:"omarchy_theme_name,omitempty"` // install as ~/.config/omarchy/themes/<name>/ and run omarchy-theme-set
+	SourceURL        string `json:"source_url,omitempty"`
+	Timestamp        int64  `json:"ts,omitempty"`
 }
 
 // Path returns the location of the handoff file.