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.
27 lines
1.1 KiB
CSS
27 lines
1.1 KiB
CSS
/* Map HyDE's waybar colour names onto the ones rules.css uses.
|
|
*
|
|
* Imported after both palette.css and the theme's own waybar.theme, so it sees
|
|
* whichever definition of each HyDE name is in force and does not care which
|
|
* file supplied it. This indirection is the whole reason a HyDE theme can
|
|
* recolour this bar without any of the rules changing.
|
|
*/
|
|
|
|
@define-color bar-fg @main-fg;
|
|
@define-color accent @wb-act-bg;
|
|
@define-color muted @wb-hvr-fg;
|
|
|
|
/* `bar-bg` IS remapped, and this is a deliberate departure from the theme.
|
|
*
|
|
* HyDE themes set bar-bg to something like rgba(0, 0, 0, 0.1) and rely on the
|
|
* compositor blurring whatever is behind the bar. cosmic-comp has no
|
|
* rule-driven blur -- `import-theme --report` lists decoration.blur.* as
|
|
* needing a compositor patch -- so honouring that value literally gives a
|
|
* ~90% transparent bar with unblurred desktop showing through and text that
|
|
* cannot be read.
|
|
*
|
|
* So the theme's own background colour is used at an opacity that works
|
|
* without blur. Delete these two lines to get the theme's literal value back,
|
|
* or once blur lands.
|
|
*/
|
|
@define-color bar-bg alpha(@main-bg, 0.85);
|