mirror of
https://github.com/outbackdingo/hyprcosmic.git
synced 2026-08-25 14:53:21 +00:00
gitops
e46514cbab
Three things stood between `assets.rs` and a themed desktop. `import-theme` never called it. The module was written, tested and unreachable; `--assets` now wires it up, with `--source`, `--overwrite` and `--dry-run`, and finds the theme repo's Source/ directory by searching upward rather than assuming HyDE's exact nesting depth. The archive guard rejected every real icon theme. Refusing any `..` in a link target is right for an entry path but wrong for a symlink: icon themes are built out of relative links into sibling directories, and Tela ships thousands of `../devices/network-wireless.svg`. What matters is whether the target resolves inside the destination, which `stays_within_root` now decides lexically -- no canonicalize, since the tree does not exist at plan time and following real links during validation would be a TOCTOU window. Absolute targets and links that climb past the root are still refused; the existing escape tests still pass. `apply` silently ignored `source`. It parsed and resolved inline while `watch` went through `compile`, and `flatten` drops `Item::Source` -- so an include that worked under `watch` vanished under `apply`. `apply` now uses `compile` too. This matters immediately: the generated theme lives in its own theme.conf, sourced from cosmic.conf, so re-importing a theme cannot clobber the keybindings. The waybar stylesheet claimed a theme could be dropped in ahead of it to recolour the bar. It could not -- HyDE names its colours main-bg/wb-act-bg and the rules referenced bar-bg/accent. Split into palette + theme + bridge + rules, imported in that order, so the claim is now true. Verified by loading the result through GTK's own CSS parser: with Tokyo Night installed main-bg resolves to #24283b and wb-act-bg to #bb9af7; with an empty theme.css the defaults stand. Both parse without error. Two deliberate departures, both commented where they are made: the theme's near-transparent bar-bg is composited at 0.85 because cosmic-comp has no blur to put behind it, and theme.css is copied next to style.css rather than imported from HyDE's own path, because a missing @import is fatal in GTK and would break the bar on any machine without a theme.
34 lines
1.4 KiB
CSS
34 lines
1.4 KiB
CSS
/* Default colours for the HyprCosmic bar.
|
|
*
|
|
* Two name sets are defined here, and both matter:
|
|
*
|
|
* - `main-bg`, `wb-act-bg` and friends are HyDE's names. A HyDE theme's
|
|
* waybar.theme is nothing but a list of these, so defining them here means
|
|
* a theme file can override them by being imported after this one.
|
|
* - `bar-bg`, `accent` and friends are the names rules.css actually uses.
|
|
*
|
|
* bridge-hyde.css maps the first set onto the second. Defining HyDE's names
|
|
* here as well is what makes a missing theme file harmless: the bridge always
|
|
* has something to resolve against, so an unthemed bar renders with these
|
|
* values instead of failing to parse.
|
|
*
|
|
* Values are Tokyo Night, matching cosmic-conf's own defaults.
|
|
*/
|
|
|
|
/* HyDE's names. Overridden by ~/.config/waybar/theme.css when a theme is in. */
|
|
@define-color main-bg #1a1b26;
|
|
@define-color main-fg #c0caf5;
|
|
@define-color wb-act-bg #7aa2f7;
|
|
@define-color wb-act-fg #1a1b26;
|
|
@define-color wb-hvr-bg #7aa2f7;
|
|
@define-color wb-hvr-fg #565f89;
|
|
|
|
/* Names with no HyDE equivalent, so never themed and always these values. */
|
|
@define-color warning #e0af68;
|
|
@define-color critical #f7768e;
|
|
|
|
/* The bar's own background. HyDE themes define this one under the same name
|
|
* we use, and typically as a low-alpha rgba() so the compositor's blur shows
|
|
* through. */
|
|
@define-color bar-bg rgba(26, 27, 38, 0.85);
|