mirror of
https://github.com/outbackdingo/hyprcosmic.git
synced 2026-08-31 16:49:30 +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.
64 lines
1.1 KiB
CSS
64 lines
1.1 KiB
CSS
/* Geometry and layout for the HyprCosmic bar.
|
|
*
|
|
* No colour literals: every colour here is a name defined by palette.css and
|
|
* possibly re-pointed by bridge-hyde.css. That separation is what lets a theme
|
|
* change the palette without touching a single rule.
|
|
*/
|
|
|
|
* {
|
|
font-family: "FontAwesome 6 Free", "Noto Sans", sans-serif;
|
|
font-size: 13px;
|
|
border: none;
|
|
border-radius: 0;
|
|
min-height: 0;
|
|
}
|
|
|
|
window#waybar {
|
|
background: @bar-bg;
|
|
color: @bar-fg;
|
|
}
|
|
|
|
#workspaces button {
|
|
padding: 0 8px;
|
|
color: @muted;
|
|
background: transparent;
|
|
}
|
|
|
|
#workspaces button.active {
|
|
color: @bar-fg;
|
|
box-shadow: inset 0 -2px @accent;
|
|
}
|
|
|
|
#workspaces button:hover {
|
|
color: @wb-hvr-fg;
|
|
background: @wb-hvr-bg;
|
|
}
|
|
|
|
#taskbar button {
|
|
padding: 0 6px;
|
|
background: transparent;
|
|
}
|
|
|
|
#taskbar button.active {
|
|
box-shadow: inset 0 -2px @accent;
|
|
}
|
|
|
|
#clock,
|
|
#pulseaudio,
|
|
#network,
|
|
#cpu,
|
|
#memory,
|
|
#battery,
|
|
#tray {
|
|
padding: 0 10px;
|
|
}
|
|
|
|
#clock {
|
|
font-weight: bold;
|
|
}
|
|
|
|
#battery.warning { color: @warning; }
|
|
#battery.critical { color: @critical; }
|
|
#network.disconnected { color: @critical; }
|
|
#pulseaudio.muted { color: @muted; }
|