diff --git a/.gitignore b/.gitignore index 7b8708d..542a943 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ !/kitty !/mako !/quickshell -!/aether +!/theme !/btop !/qt5ct !/qt6ct @@ -20,9 +20,6 @@ !/.gitignore !/README.md -# Runtime/lock artifacts -aether/aether.sock.pid - # Manual pre-git backups — superseded by git history *.bak-* /hypr/backups/ diff --git a/README.md b/README.md index 87115d7..6c6273a 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ My personal dotfiles for a [Hyprland](https://hyprland.org/) desktop on Arch Lin | Launcher | Rofi | | Terminal | Kitty | | Cursor | Custom Arch-logo cursor set (pointer, text, resize, wait spinner, …) in the rice palette — artwork in [`shapes.py`](hypr/cursor/shapes.py), [`build.py`](hypr/cursor/build.py) installs a Hyprcursor and an XCursor theme to `~/.local/share/icons/ArchLogo` | -| Notifications | [mako](mako/) — themed via aether, same as the rest | -| Theming | [aether](aether/) — palette-driven theme generator | +| Notifications | [mako](mako/) — themed from the palette, same as the rest | +| Theming | [`theme/`](theme/) — homegrown palette-driven theme generator (`render.py`), controlled from the Quickshell desktop widget or the CLI | | Qt/GTK theming | qt5ct, qt6ct, nwg-look | | File manager | Dolphin (`kdeglobals`, `dolphinrc`) | @@ -40,6 +40,8 @@ All the stats are pulled by small shell scripts in `quickshell/default/scripts/` Hyprland itself is configured via [`hypr/hyprland.lua`](hypr/hyprland.lua) (Hyprland's Lua config API) — that's the active config; `hyprland.conf` is kept around for reference but is no longer loaded. One consequence: `hyprctl dispatch` (and anything sending it a raw dispatch string, like this bar's workspace/window-switcher clicks) needs the new `hl.dsp.*` Lua-expression syntax instead of the classic one, e.g. `hl.dsp.focus({workspace = 1})` rather than `workspace 1`. +There's also a `no_fullscreen_kitty` window rule in there working around a real Hyprland quirk: newly opened kitty windows were coming up in genuine fullscreen (`hasfullscreen: true`, not just a full-size tile) regardless of workspace, needing `fullscreen()` dispatched twice to clear. Root cause not found (no rule/config was causing it); `fullscreen_state = "0 0"` on kitty forces both the internal and client-requested state off on open. Plain `fullscreen = false` is a no-op — that's just the default, it doesn't override anything. + ## Cursor The mouse cursor is a custom theme, `ArchLogo`, with every shape redrawn in the rice style instead of only the arrow: @@ -50,13 +52,20 @@ The mouse cursor is a custom theme, `ArchLogo`, with every shape redrawn in the The artwork is drawn procedurally in [`hypr/cursor/shapes.py`](hypr/cursor/shapes.py); [`hypr/cursor/build.py`](hypr/cursor/build.py) renders it (needs `rsvg-convert` and `hyprcursor-util`) into a Hyprcursor theme for Hyprland and an XCursor theme for GTK/Qt/XWayland apps, both installed to `~/.local/share/icons/ArchLogo`. Adwaita is only used as the shape/alias list and fallback. It also writes `~/.local/share/icons/default/index.theme` (`Inherits=ArchLogo`), Xcursor's fallback theme, so apps that never see `XCURSOR_THEME` (Steam and Proton games started before the env was set) get the cursor too — restart Steam once after installing. After editing `shapes.py`, run `python3 hypr/cursor/build.py` and `hyprctl setcursor ArchLogo 24`. `hyprland.lua` sets the theme via `XCURSOR_THEME` / `HYPRCURSOR_THEME` and gsettings. -## Theming (aether) +## Theming -The color palette lives in [`aether/`](aether/) and is the single source of truth — [`aether/theme/colors.toml`](aether/theme/colors.toml) defines the palette, and aether renders it out into per-app configs (Hyprland, Kitty, Rofi, Waybar-era CSS, btop, Zed, etc.), most of which get `@import`ed or sourced by that app's real config rather than edited directly. The bar's own colors in `Bar.qml` are hand-matched to this palette rather than generated, since Quickshell reads QML, not CSS. +Theming used to go through a third-party app called aether; it's gone now (it didn't work reliably), replaced with a small homegrown system in [`theme/`](theme/): -mako's per-urgency border colors (normal = accent, low = muted, critical = red) work the same way as Hyprland's border colors: a template at [`aether/custom/mako/colors.ini`](aether/custom/mako/colors.ini) gets rendered by aether into `mako/colors.ini`, which the real `mako/config` pulls in via `include=`. Edit the template, not the generated file — it gets overwritten on the next theme switch. +- [`theme/colors.toml`](theme/colors.toml) is the single source of truth for the palette (accent, cursor, foreground/background, 16 ANSI colors) +- [`theme/templates//`](theme/templates/) holds one `{config.json, template}` pair per themed app (Hyprland, Kitty, Rofi, mako). `config.json` names the destination file; the template uses `{key}` placeholders (`{color4}`, `{background}`, `{accent}`, …), `{key.strip}` for the hex without `#`, or `{key.rgba:ALPHA}` for a `rgba(r, g, b, ALPHA)` string +- [`theme/render.py`](theme/render.py) renders every template to its destination and reloads the affected apps (`hyprctl reload`, `makoctl reload`, kitty via `SIGUSR1`). Run it after editing a template by hand, or use `--set KEY '#rrggbb'` to change one color from a terminal, `--get KEY` / `--dump` to read the palette back out +- [`theme/wallpaper.py`](theme/wallpaper.py) swaps the wallpaper: `apply ` archives the current one (deduped by hash) into `~/.local/share/quickshell/wallpapers/` and copies the new one to [`hypr/wallpaper.png`](hypr/wallpaper.png) (loaded via `swaybg` in `hyprland.lua`), `pick` does the same via a native file picker, `list` feeds the widget's gallery of past wallpapers -It's a blue theme (`#1793d1` accent on a dark `#1a1b26` background) built around the stock default Hyprland wallpaper — the anime girl waiting at the train stop with the glowing blue Hyprland-logo cats. Every accent color across the bar, Rofi, Kitty, and the rest was picked to match that wallpaper's palette rather than the other way around. The wallpaper itself is tracked at [`hypr/wallpaper.png`](hypr/wallpaper.png) and set via `swaybg` in `hyprland.lua`. +mako's per-urgency border colors (normal = accent, low = muted, critical = red) work the same way as Hyprland's border colors: edit the template at `theme/templates/mako/colors.ini`, not `mako/colors.ini` itself — that gets overwritten on the next render. + +Day to day, neither script needs to be run by hand — the **theme widget**, a small standalone Quickshell window pinned to the top-left corner of the main monitor (independent of the bar), has two buttons: a picture icon opens the wallpaper gallery/picker, a paintbrush icon opens a menu to pick which color role to change and then a palette (plus a hex field) to change it to. Both call straight into the scripts above. + +It's a blue theme (`#1793d1` accent on a dark `#1a1b26` background) built around the stock default Hyprland wallpaper — the anime girl waiting at the train stop with the glowing blue Hyprland-logo cats. Every accent color across the bar, Rofi, Kitty, and the rest was picked to match that wallpaper's palette rather than the other way around. ## Hotkeys @@ -126,17 +135,17 @@ It's a blue theme (`#1793d1` accent on a dark `#1a1b26` background) built around ## Requirements -Beyond Hyprland itself, the bar's scripts expect: `quickshell`, `nmcli`, `wpctl`, `nvidia-smi` (GPU stats — no-ops gracefully if absent), `sensors` (lm_sensors, for CPU temperature), `python3`, and `curl` (for the network widget's public-IP lookup). +Beyond Hyprland itself, the bar's scripts expect: `quickshell`, `nmcli`, `wpctl`, `nvidia-smi` (GPU stats — no-ops gracefully if absent), `sensors` (lm_sensors, for CPU temperature), `python3`, and `curl` (for the network widget's public-IP lookup). The theme widget's wallpaper picker additionally needs `zenity` (native file picker) and `swaybg`. ## Layout ``` hypr/ Hyprland config (hyprland.lua is active, .conf kept for reference) + wallpaper.png + cursor/ (cursor theme source) -quickshell/ The bar (Bar.qml + helper QML components + scripts/) +quickshell/ The bar (Bar.qml + helper QML components + scripts/) + ThemeWidget.qml (theming widget) rofi/ Launcher config + theme kitty/ Terminal config + theme -mako/ Notification daemon config (colors.ini generated by aether) -aether/ Palette source + generated per-app theme files +mako/ Notification daemon config (colors.ini generated by theme/render.py) +theme/ Palette source (colors.toml), per-app templates, render.py + wallpaper.py btop/ System monitor config qt5ct/ qt6ct/ nwg-look/ gtk-3.0/ Qt/GTK theming ``` diff --git a/aether/blueprints/main-theme.json b/aether/blueprints/main-theme.json deleted file mode 100644 index e6bb9b0..0000000 --- a/aether/blueprints/main-theme.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "main theme", - "palette": { - "colors": [ - "#1e1e2e", - "#f38ba8", - "#a6e3a1", - "#f9e2af", - "#89b4fa", - "#cba6f7", - "#94e2d5", - "#cdd6f4", - "#45475a", - "#f38ba8", - "#a6e3a1", - "#f9e2af", - "#89b4fa", - "#cba6f7", - "#94e2d5", - "#ffffff" - ], - "extendedColors": { - "accent": "#89b4fa", - "cursor": "#cdd6f4", - "selection_background": "#cdd6f4", - "selection_foreground": "#1e1e2e" - } - }, - "adjustments": { - "blackPoint": 0, - "brightness": 0, - "contrast": 0, - "gamma": 1, - "highlights": 0, - "hueShift": 0, - "saturation": 0, - "shadows": 0, - "temperature": 0, - "tint": 0, - "vibrance": 0, - "whitePoint": 0 - }, - "settings": {}, - "timestamp": 1784896212083 -} diff --git a/aether/custom/hyprland/config.json b/aether/custom/hyprland/config.json deleted file mode 100644 index fde8d01..0000000 --- a/aether/custom/hyprland/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "template": "theme.conf", - "destination": "~/.config/hypr/aether-theme.conf" -} diff --git a/aether/custom/kitty/config.json b/aether/custom/kitty/config.json deleted file mode 100644 index 273ab1b..0000000 --- a/aether/custom/kitty/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "template": "theme.conf", - "destination": "~/.config/kitty/aether-colors.conf" -} diff --git a/aether/custom/kitty/theme.conf b/aether/custom/kitty/theme.conf deleted file mode 100644 index bc19a0a..0000000 --- a/aether/custom/kitty/theme.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/kitty/theme.conf, not the output. -background {background} -foreground {foreground} -cursor {cursor} diff --git a/aether/custom/rofi/config.json b/aether/custom/rofi/config.json deleted file mode 100644 index 5c08860..0000000 --- a/aether/custom/rofi/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "template": "theme.rasi", - "destination": "~/.config/rofi/aether-colors.rasi" -} diff --git a/aether/custom/waybar/colors.css b/aether/custom/waybar/colors.css deleted file mode 100644 index e85c73c..0000000 --- a/aether/custom/waybar/colors.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Generated by aether from the active palette. - Edit the template at ~/.config/aether/custom/waybar/colors.css, not the output. */ -@define-color background {background}; -@define-color foreground {foreground}; -@define-color accent {accent}; -@define-color muted {color8}; -@define-color red {color1}; -@define-color green {color2}; -@define-color yellow {color3}; -@define-color blue {color12}; -@define-color cyan {color6}; -@define-color magenta {color5}; -@define-color bright_white {color15}; diff --git a/aether/custom/waybar/config.json b/aether/custom/waybar/config.json deleted file mode 100644 index c28f345..0000000 --- a/aether/custom/waybar/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "template": "colors.css", - "destination": "~/.config/waybar/aether-colors.css" -} diff --git a/aether/settings.json b/aether/settings.json deleted file mode 100644 index d1e83ce..0000000 --- a/aether/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "excludedApps": {}, - "includeGtk": false, - "includeNeovim": false, - "includeVscode": false, - "includeZed": true, - "selectedNeovimConfig": "", - "videoCpuMode": false -} diff --git a/aether/theme/aether.zed.json b/aether/theme/aether.zed.json deleted file mode 100644 index a730be0..0000000 --- a/aether/theme/aether.zed.json +++ /dev/null @@ -1,457 +0,0 @@ -{ - "$schema": "https://zed.dev/schema/themes/v0.2.0.json", - "name": "aether", - "author": "Aether", - "themes": [ - { - "name": "Aether", - "appearance": "dark", - "style": { - "background": "#1a1b26", - "border": "#565f8940", - "border.variant": "#565f8960", - "border.focused": "#1793d1", - "border.selected": "#1793d180", - "border.transparent": "#00000000", - "border.disabled": "#565f8930", - - "elevated_surface.background": "#31323c", - "surface.background": "#31323c", - - "element.background": "#31323c", - "element.hover": "#565f8940", - "element.active": "#1793d130", - "element.selected": "#1793d125", - "element.disabled": "#565f8920", - - "drop_target.background": "#1793d120", - - "ghost_element.background": "#00000000", - "ghost_element.hover": "#31323c", - "ghost_element.active": "#1793d130", - "ghost_element.selected": "#1793d125", - "ghost_element.disabled": "#565f8920", - - "text": "#c0caf5", - "text.muted": "#565f89", - "text.placeholder": "#565f89", - "text.disabled": "#565f8980", - "text.accent": "#1793d1", - - "icon": "#c0caf5", - "icon.muted": "#565f89", - "icon.disabled": "#565f8960", - "icon.placeholder": "#565f89", - "icon.accent": "#1793d1", - - "status_bar.background": "#31323c", - "title_bar.background": "#31323c", - "title_bar.inactive_background": "#31323c", - "toolbar.background": "#1a1b26", - "tab_bar.background": "#31323c", - "tab.inactive_background": "#31323c", - "tab.active_background": "#1a1b26", - - "search.match_background": "#f9e2af40", - - "panel.background": "#31323c", - "panel.focused_border": "#1793d1", - - "pane.focused_border": "#1793d1", - - "scrollbar.thumb.background": "#565f8930", - "scrollbar.thumb.hover_background": "#565f8960", - "scrollbar.thumb.border": "#565f8920", - "scrollbar.track.background": "#00000000", - "scrollbar.track.border": "#00000000", - - "editor.foreground": "#c0caf5", - "editor.background": "#1a1b26", - "editor.gutter.background": "#1a1b26", - "editor.subheader.background": "#31323c", - "editor.active_line.background": "#31323c", - "editor.highlighted_line.background": "#1793d115", - "editor.line_number": "#565f89", - "editor.active_line_number": "#c0caf5", - "editor.invisible": "#565f8940", - "editor.wrap_guide": "#565f8930", - "editor.active_wrap_guide": "#565f8960", - "editor.document_highlight.read_background": "#1793d120", - "editor.document_highlight.write_background": "#1793d130", - - "terminal.background": "#1a1b26", - "terminal.foreground": "#c0caf5", - "terminal.bright_foreground": "#d0d7f8", - "terminal.dim_foreground": "#565f89", - "terminal.ansi.black": "#1a1b26", - "terminal.ansi.bright_black": "#565f89", - "terminal.ansi.dim_black": "#1a1b2680", - "terminal.ansi.red": "#f7768e", - "terminal.ansi.bright_red": "#f7768e", - "terminal.ansi.dim_red": "#f7768e80", - "terminal.ansi.green": "#a6e3a1", - "terminal.ansi.bright_green": "#a6e3a1", - "terminal.ansi.dim_green": "#a6e3a180", - "terminal.ansi.yellow": "#f9e2af", - "terminal.ansi.bright_yellow": "#f9e2af", - "terminal.ansi.dim_yellow": "#f9e2af80", - "terminal.ansi.blue": "#1793d1", - "terminal.ansi.bright_blue": "#7aa2f7", - "terminal.ansi.dim_blue": "#1793d180", - "terminal.ansi.magenta": "#cba6f7", - "terminal.ansi.bright_magenta": "#cba6f7", - "terminal.ansi.dim_magenta": "#cba6f780", - "terminal.ansi.cyan": "#89dceb", - "terminal.ansi.bright_cyan": "#89dceb", - "terminal.ansi.dim_cyan": "#89dceb80", - "terminal.ansi.white": "#c0caf5", - "terminal.ansi.bright_white": "#d0d7f8", - "terminal.ansi.dim_white": "#c0caf580", - - "link_text.hover": "#1793d1", - - "conflict": "#f9e2af", - "conflict.background": "#f9e2af15", - "conflict.border": "#f9e2af", - - "created": "#a6e3a1", - "created.background": "#a6e3a115", - "created.border": "#a6e3a1", - - "deleted": "#f7768e", - "deleted.background": "#f7768e15", - "deleted.border": "#f7768e", - - "error": "#f7768e", - "error.background": "#f7768e15", - "error.border": "#f7768e", - - "hidden": "#565f89", - "hidden.background": "#565f8915", - "hidden.border": "#565f89", - - "hint": "#89dceb", - "hint.background": "#89dceb15", - "hint.border": "#89dceb", - - "ignored": "#565f89", - "ignored.background": "#565f8915", - "ignored.border": "#565f89", - - "info": "#1793d1", - "info.background": "#1793d115", - "info.border": "#1793d1", - - "modified": "#f88b9f", - "modified.background": "#f88b9f15", - "modified.border": "#f88b9f", - - "predictive": "#565f89", - "predictive.background": "#565f8915", - "predictive.border": "#565f8940", - - "renamed": "#89dceb", - "renamed.background": "#89dceb15", - "renamed.border": "#89dceb", - - "success": "#a6e3a1", - "success.background": "#a6e3a115", - "success.border": "#a6e3a1", - - "unreachable": "#565f89", - "unreachable.background": "#565f8915", - "unreachable.border": "#565f89", - - "warning": "#f9e2af", - "warning.background": "#f9e2af15", - "warning.border": "#f9e2af", - - "players": [ - { - "cursor": "#c0caf5", - "selection": "#c0caf560", - "background": "#1793d1" - }, - { - "cursor": "#89dceb", - "selection": "#89dceb40", - "background": "#89dceb" - }, - { - "cursor": "#cba6f7", - "selection": "#cba6f740", - "background": "#cba6f7" - }, - { - "cursor": "#f9e2af", - "selection": "#f9e2af40", - "background": "#f9e2af" - }, - { - "cursor": "#a6e3a1", - "selection": "#a6e3a140", - "background": "#a6e3a1" - }, - { - "cursor": "#f7768e", - "selection": "#f7768e40", - "background": "#f7768e" - }, - { - "cursor": "#1793d1", - "selection": "#1793d140", - "background": "#1793d1" - }, - { - "cursor": "#f7768e", - "selection": "#f7768e40", - "background": "#f7768e" - } - ], - - "syntax": { - "attribute": { - "color": "#f9e2af", - "font_style": "italic", - "font_weight": null - }, - "boolean": { - "color": "#f88b9f", - "font_style": null, - "font_weight": null - }, - "comment": { - "color": "#565f89", - "font_style": "italic", - "font_weight": null - }, - "comment.doc": { - "color": "#565f89", - "font_style": "italic", - "font_weight": null - }, - "constant": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "constructor": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "embedded": { - "color": "#c0caf5", - "font_style": null, - "font_weight": null - }, - "emphasis": { - "color": "#f7768e", - "font_style": "italic", - "font_weight": null - }, - "emphasis.strong": { - "color": "#f7768e", - "font_style": null, - "font_weight": 700 - }, - "enum": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "function": { - "color": "#1793d1", - "font_style": null, - "font_weight": null - }, - "function.builtin": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "function.definition": { - "color": "#1793d1", - "font_style": null, - "font_weight": null - }, - "function.method": { - "color": "#1793d1", - "font_style": null, - "font_weight": null - }, - "function.special.definition": { - "color": "#1793d1", - "font_style": null, - "font_weight": null - }, - "hint": { - "color": "#565f89", - "font_style": "italic", - "font_weight": null - }, - "keyword": { - "color": "#cba6f7", - "font_style": null, - "font_weight": null - }, - "label": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "link_text": { - "color": "#1793d1", - "font_style": null, - "font_weight": null - }, - "link_uri": { - "color": "#89dceb", - "font_style": "underline", - "font_weight": null - }, - "number": { - "color": "#f88b9f", - "font_style": null, - "font_weight": null - }, - "operator": { - "color": "#7aa2f7", - "font_style": null, - "font_weight": null - }, - "predictive": { - "color": "#565f89", - "font_style": "italic", - "font_weight": null - }, - "preproc": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "primary": { - "color": "#c0caf5", - "font_style": null, - "font_weight": null - }, - "property": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "punctuation": { - "color": "#9098b8", - "font_style": null, - "font_weight": null - }, - "punctuation.bracket": { - "color": "#9098b8", - "font_style": null, - "font_weight": null - }, - "punctuation.delimiter": { - "color": "#9098b8", - "font_style": null, - "font_weight": null - }, - "punctuation.list_marker": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "punctuation.special": { - "color": "#7aa2f7", - "font_style": null, - "font_weight": null - }, - "string": { - "color": "#a6e3a1", - "font_style": null, - "font_weight": null - }, - "string.escape": { - "color": "#cba6f7", - "font_style": null, - "font_weight": null - }, - "string.regex": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "string.special": { - "color": "#a6e3a1", - "font_style": null, - "font_weight": null - }, - "string.special.symbol": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "tag": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "text.literal": { - "color": "#a6e3a1", - "font_style": null, - "font_weight": null - }, - "title": { - "color": "#1793d1", - "font_style": null, - "font_weight": 700 - }, - "type": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "type.builtin": { - "color": "#c0caf5", - "font_style": null, - "font_weight": null - }, - "type.interface": { - "color": "#f9e2af", - "font_style": null, - "font_weight": null - }, - "type.super": { - "color": "#f9e2af", - "font_style": "italic", - "font_weight": null - }, - "variable": { - "color": "#c0caf5", - "font_style": null, - "font_weight": null - }, - "variable.member": { - "color": "#89dceb", - "font_style": null, - "font_weight": null - }, - "variable.parameter": { - "color": "#89dceb", - "font_style": "italic", - "font_weight": null - }, - "variable.special": { - "color": "#c0caf5", - "font_style": "italic", - "font_weight": null - }, - "variant": { - "color": "#f88b9f", - "font_style": null, - "font_weight": null - } - } - } - } - ] -} diff --git a/aether/theme/alacritty.toml b/aether/theme/alacritty.toml deleted file mode 100644 index 2fd586d..0000000 --- a/aether/theme/alacritty.toml +++ /dev/null @@ -1,28 +0,0 @@ -[colors] -[colors.primary] -background = "#1a1b26" -foreground = "#c0caf5" - -[colors.normal] -black = "#1a1b26" -red = "#f7768e" -green = "#a6e3a1" -yellow = "#f9e2af" -blue = "#1793d1" -magenta = "#cba6f7" -cyan = "#89dceb" -white = "#c0caf5" - -[colors.bright] -black = "#565f89" -red = "#f7768e" -green = "#a6e3a1" -yellow = "#f9e2af" -blue = "#7aa2f7" -magenta = "#cba6f7" -cyan = "#89dceb" -white = "#ffffff" - -[colors.cursor] -text = "#1a1b26" -cursor = "#c0caf5" diff --git a/aether/theme/backgrounds/wallhaven-6lpp9x.png b/aether/theme/backgrounds/wallhaven-6lpp9x.png deleted file mode 100644 index 5f6aa0c..0000000 Binary files a/aether/theme/backgrounds/wallhaven-6lpp9x.png and /dev/null differ diff --git a/aether/theme/btop.theme b/aether/theme/btop.theme deleted file mode 100644 index 244fdec..0000000 --- a/aether/theme/btop.theme +++ /dev/null @@ -1,93 +0,0 @@ -# Main background, empty for terminal default, need to be empty if you want transparent background -theme[main_bg]="#1a1b26" - -# Main text color -theme[main_fg]="#c0caf5" - -# Title color for boxes -theme[title]="#c0caf5" - -# Highlight color for keyboard shortcuts -theme[hi_fg]="#1793d1" - -# Background color of selected item in processes box. #c0caf5 maps to -# the foreground role in aether (terminal selection wants inverted contrast), -# which renders as plain white on dark themes - indistinguishable from the -# main text. #31323c gives a subtle highlight that still reads on a -# dark background and is invisible-but-harmless on light backgrounds. -theme[selected_bg]="#31323c" - -# Foreground color of selected item in processes box. Use #c0caf5 so -# the row text stays readable on the lighter_bg highlight; the previous -# #1793d1 produced low-contrast blue-on-white in dark themes. -theme[selected_fg]="#c0caf5" - -# Color of inactive/disabled text -theme[inactive_fg]="#565f89" - -# Color of text appearing on top of graphs, i.e uptime and current network graph scaling. -# #c9d2f7 caps at #ffffff when the foreground is already pure white, so we -# just bind it to #c0caf5 directly. -theme[graph_text]="#c0caf5" - -# Background color of the percentage meters. Same fix as selected_bg - the -# previous #c0caf5 collapsed to the main fg. -theme[meter_bg]="#31323c" - -# Misc colors for processes box including mini cpu graphs, details memory graph and details status text. -# Use #89dceb for a distinct accent instead of #c9d2f7 which capped to white. -theme[proc_misc]="#89dceb" - -# CPU, Memory, Network, Proc box outline colors -theme[cpu_box]="#cba6f7" -theme[mem_box]="#a6e3a1" -theme[net_box]="#f7768e" -theme[proc_box]="#1793d1" - -# Box divider line and small boxes line color -theme[div_line]="#565f89" - -# Temperature graph color (Green -> Yellow -> Red) -theme[temp_start]="#a6e3a1" -theme[temp_mid]="#f9e2af" -theme[temp_end]="#f7768e" - -# CPU graph colors (Teal -> Blue -> Purple) -theme[cpu_start]="#89dceb" -theme[cpu_mid]="#1793d1" -theme[cpu_end]="#cba6f7" - -# Mem/Disk free meter -theme[free_start]="#cba6f7" -theme[free_mid]="#1793d1" -theme[free_end]="#89dceb" - -# Mem/Disk cached meter -theme[cached_start]="#1793d1" -theme[cached_mid]="#89dceb" -theme[cached_end]="#cba6f7" - -# Mem/Disk available meter -theme[available_start]="#f9e2af" -theme[available_mid]="#f7768e" -theme[available_end]="#f7768e" - -# Mem/Disk used meter (Green -> Teal -> Blue) -theme[used_start]="#a6e3a1" -theme[used_mid]="#89dceb" -theme[used_end]="#1793d1" - -# Download graph colors -theme[download_start]="#f9e2af" -theme[download_mid]="#f7768e" -theme[download_end]="#f7768e" - -# Upload graph colors (Green -> Teal -> Blue) -theme[upload_start]="#a6e3a1" -theme[upload_mid]="#89dceb" -theme[upload_end]="#1793d1" - -# Process box color gradient for threads, mem and cpu usage -theme[process_start]="#89dceb" -theme[process_mid]="#1793d1" -theme[process_end]="#cba6f7" diff --git a/aether/theme/chromium.theme b/aether/theme/chromium.theme deleted file mode 100644 index bf2774d..0000000 --- a/aether/theme/chromium.theme +++ /dev/null @@ -1 +0,0 @@ -26,27,38 diff --git a/aether/theme/foot.ini b/aether/theme/foot.ini deleted file mode 100644 index 467a617..0000000 --- a/aether/theme/foot.ini +++ /dev/null @@ -1,25 +0,0 @@ -[colors-dark] -foreground=c0caf5 -background=1a1b26 -selection-foreground=1a1b26 -selection-background=c0caf5 - -cursor=1a1b26 c0caf5 - -regular0=1a1b26 -regular1=f7768e -regular2=a6e3a1 -regular3=f9e2af -regular4=1793d1 -regular5=cba6f7 -regular6=89dceb -regular7=c0caf5 - -bright0=565f89 -bright1=f7768e -bright2=a6e3a1 -bright3=f9e2af -bright4=7aa2f7 -bright5=cba6f7 -bright6=89dceb -bright7=d0d7f8 diff --git a/aether/theme/ghostty.conf b/aether/theme/ghostty.conf deleted file mode 100644 index 8088b56..0000000 --- a/aether/theme/ghostty.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Background and foreground colors -background = #1a1b26 -foreground = #c0caf5 - -# Standard colors -palette = 0=#1a1b26 -palette = 1=#f7768e -palette = 2=#a6e3a1 -palette = 3=#f9e2af -palette = 4=#1793d1 -palette = 5=#cba6f7 -palette = 6=#89dceb -palette = 7=#c0caf5 - -# Bright colors -palette = 8=#565f89 -palette = 9=#f7768e -palette = 10=#a6e3a1 -palette = 11=#f9e2af -palette = 12=#7aa2f7 -palette = 13=#cba6f7 -palette = 14=#89dceb -palette = 15=#ffffff diff --git a/aether/theme/hyprland.conf b/aether/theme/hyprland.conf deleted file mode 100644 index 803f0d7..0000000 --- a/aether/theme/hyprland.conf +++ /dev/null @@ -1,12 +0,0 @@ -# This file is not a full hyprland configuration. -# It is intended to be included in your main hyprland.conf. - -$activeBorderColor = rgb(1793d1) - -general { - col.active_border = $activeBorderColor -} - -group { - col.border_active = $activeBorderColor -} diff --git a/aether/theme/hyprlock.conf b/aether/theme/hyprlock.conf deleted file mode 100644 index 88619ff..0000000 --- a/aether/theme/hyprlock.conf +++ /dev/null @@ -1,6 +0,0 @@ -$color = rgba(26, 27, 38, 1) -$inner_color = rgba(26, 27, 38, 0.66) -$outer_color = rgba(203, 166, 247, 1) -$font_color = rgba(192, 202, 245, 1) -$placeholder_color = rgba(192, 202, 245, 0.7) -$check_color = rgba(137, 220, 235, 1) diff --git a/aether/theme/icons.theme b/aether/theme/icons.theme deleted file mode 100644 index 24e9162..0000000 --- a/aether/theme/icons.theme +++ /dev/null @@ -1 +0,0 @@ -Yaru-purple \ No newline at end of file diff --git a/aether/theme/kitty-colors.conf b/aether/theme/kitty-colors.conf deleted file mode 100644 index 9916ab5..0000000 --- a/aether/theme/kitty-colors.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/kitty/theme.conf, not the output. -background #1a1b26 -foreground #c0caf5 -cursor #c0caf5 diff --git a/aether/theme/kitty.conf b/aether/theme/kitty.conf deleted file mode 100644 index ec68772..0000000 --- a/aether/theme/kitty.conf +++ /dev/null @@ -1,36 +0,0 @@ -background #1a1b26 -foreground #c0caf5 - -# black -color0 #1a1b26 -color8 #565f89 - -# red -color1 #f7768e -color9 #f7768e - -# green -color2 #a6e3a1 -color10 #a6e3a1 - -# yellow -color3 #f9e2af -color11 #f9e2af - -# blue -color4 #1793d1 -color12 #7aa2f7 - -# magenta -color5 #cba6f7 -color13 #cba6f7 - -#cyan -color6 #89dceb -color14 #89dceb - -#white -color7 #c0caf5 -color15 #ffffff - - diff --git a/aether/theme/mako.ini b/aether/theme/mako.ini deleted file mode 100644 index b7a23a1..0000000 --- a/aether/theme/mako.ini +++ /dev/null @@ -1,21 +0,0 @@ -text-color=#c0caf5 -border-color=#cba6f7 -background-color=#1a1b26 -width=420 -height=110 -padding=10 -border-size=2 -font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 -max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false diff --git a/aether/theme/neovim.lua b/aether/theme/neovim.lua deleted file mode 100644 index f19e5fa..0000000 --- a/aether/theme/neovim.lua +++ /dev/null @@ -1,52 +0,0 @@ -return { - { - "bjarneo/aether.nvim", - branch = "v3", - name = "aether", - priority = 1000, - opts = { - colors = { - bg = "#1a1b26", - dark_bg = "#14141d", - darker_bg = "#0d0e13", - lighter_bg = "#31323c", - - fg = "#c0caf5", - dark_fg = "#9098b8", - light_fg = "#c9d2f7", - bright_fg = "#d0d7f8", - muted = "#565f89", - - red = "#f7768e", - yellow = "#f9e2af", - orange = "#f88b9f", - green = "#a6e3a1", - cyan = "#89dceb", - blue = "#1793d1", - purple = "#cba6f7", - brown = "#95535f", - - bright_red = "#f7768e", - bright_yellow = "#f9e2af", - bright_green = "#a6e3a1", - bright_cyan = "#89dceb", - bright_blue = "#7aa2f7", - bright_purple = "#cba6f7", - - accent = "#1793d1", - cursor = "#c0caf5", - foreground = "#c0caf5", - background = "#1a1b26", - selection = "#31323c", - selection_foreground = "#c0caf5", - selection_background = "#31323c", - }, - }, - }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = "aether", - }, - }, -} diff --git a/aether/theme/swayosd.css b/aether/theme/swayosd.css deleted file mode 100644 index cd3b694..0000000 --- a/aether/theme/swayosd.css +++ /dev/null @@ -1,5 +0,0 @@ -@define-color background-color #1a1b26; -@define-color border-color #565f89; -@define-color label #c0caf5; -@define-color image #c0caf5; -@define-color progress #f9e2af; \ No newline at end of file diff --git a/aether/theme/vencord.theme.css b/aether/theme/vencord.theme.css deleted file mode 100644 index 85ccae5..0000000 --- a/aether/theme/vencord.theme.css +++ /dev/null @@ -1,29 +0,0 @@ -/** -* @name base16 Discord -* @author @bypass_ -* @version 0.1.0 -* @description Built using Aether and Pywal -* @source https://github.com/imbypass/base16-Discord -**/ - -/* import the parent */ -@import url('https://imbypass.github.io/base16-discord/omarchy-discord.theme.css'); - -:root { - --color00: #1a1b26; - --color01: #f7768e; - --color02: #a6e3a1; - --color03: #f9e2af; - --color04: #1793d1; - --color05: #cba6f7; - --color06: #89dceb; - --color07: #c0caf5; - --color08: #565f89; - --color09: #f7768e; - --color10: #a6e3a1; - --color11: #f9e2af; - --color12: #7aa2f7; - --color13: #cba6f7; - --color14: #89dceb; - --color15: #ffffff; -} diff --git a/aether/theme/vscode.json b/aether/theme/vscode.json deleted file mode 100644 index bc0f7dc..0000000 --- a/aether/theme/vscode.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "Aether", - "extension": "local.theme-aether" -} diff --git a/aether/theme/walker.css b/aether/theme/walker.css deleted file mode 100644 index 6b751b6..0000000 --- a/aether/theme/walker.css +++ /dev/null @@ -1,6 +0,0 @@ -@define-color selected-text #1793d1; -@define-color text #c0caf5; -@define-color base #1a1b26; -@define-color border #565f89; -@define-color foreground #c0caf5; -@define-color background #1a1b26; diff --git a/aether/theme/warp.yaml b/aether/theme/warp.yaml deleted file mode 100644 index 1d21b75..0000000 --- a/aether/theme/warp.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Aether -accent: "#1793d1" -cursor: "#1793d1" -background: "#1a1b26" -foreground: "#c0caf5" -details: darker - -terminal_colors: - normal: - black: "#1a1b26" - red: "#f7768e" - green: "#a6e3a1" - yellow: "#f9e2af" - blue: "#1793d1" - magenta: "#cba6f7" - cyan: "#89dceb" - white: "#c0caf5" - bright: - black: "#565f89" - red: "#f7768e" - green: "#a6e3a1" - yellow: "#f9e2af" - blue: "#7aa2f7" - magenta: "#cba6f7" - cyan: "#89dceb" - white: "#ffffff" diff --git a/aether/theme/waybar-colors.css b/aether/theme/waybar-colors.css deleted file mode 100644 index 45b7b70..0000000 --- a/aether/theme/waybar-colors.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Generated by aether from the active palette. - Edit the template at ~/.config/aether/custom/waybar/colors.css, not the output. */ -@define-color background #1a1b26; -@define-color foreground #c0caf5; -@define-color accent #1793d1; -@define-color muted #565f89; -@define-color red #f7768e; -@define-color green #a6e3a1; -@define-color yellow #f9e2af; -@define-color blue #7aa2f7; -@define-color cyan #89dceb; -@define-color magenta #cba6f7; -@define-color bright_white #ffffff; diff --git a/aether/theme/waybar.css b/aether/theme/waybar.css deleted file mode 100644 index 2edebd0..0000000 --- a/aether/theme/waybar.css +++ /dev/null @@ -1,2 +0,0 @@ -@define-color background #1a1b26; -@define-color foreground #c0caf5; diff --git a/aether/theme/wofi.css b/aether/theme/wofi.css deleted file mode 100644 index 8802cac..0000000 --- a/aether/theme/wofi.css +++ /dev/null @@ -1,49 +0,0 @@ -@define-color bg #1a1b26; -@define-color fg #c0caf5; -@define-color gray1 #a6e3a1; -@define-color gray2 #565f89; -@define-color gray3 #1793d1; -@define-color gray4 #f9e2af; -@define-color gray5 #cba6f7; -@define-color fg_bright #ffffff; - -window { - background-color: @bg; - border: 2px solid @gray3; -} - -input { - background-color: @bg; - color: @fg; - border: 1px solid @gray2; -} - -input:selected { - background-color: @gray1; - color: @fg_bright; -} - -#entry { - color: @fg; - background-color: @bg; - padding: 5px; - margin: 2px; -} - -#entry:selected { - background-color: @gray1; - color: @fg_bright; -} - -scrollbar { - background-color: @bg; -} - -scrollbar slider { - background-color: @gray2; - border-radius: 5px; -} - -scrollbar slider:hover { - background-color: @gray3; -} \ No newline at end of file diff --git a/aether/theme/zellij.kdl b/aether/theme/zellij.kdl deleted file mode 100644 index 0235bfb..0000000 --- a/aether/theme/zellij.kdl +++ /dev/null @@ -1,120 +0,0 @@ -themes { - current { - text_unselected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - text_selected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - ribbon_selected { - base 86 95 137 - background 166 227 161 - emphasis_0 247 118 142 - emphasis_1 248 139 159 - emphasis_2 203 166 247 - emphasis_3 122 162 247 - } - ribbon_unselected { - base 86 95 137 - background 192 202 245 - emphasis_0 247 118 142 - emphasis_1 192 202 245 - emphasis_2 122 162 247 - emphasis_3 203 166 247 - } - table_title { - base 166 227 161 - background 0 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - table_cell_selected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - table_cell_unselected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - list_selected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - list_unselected { - base 192 202 245 - background 86 95 137 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 166 227 161 - emphasis_3 203 166 247 - } - frame_selected { - base 166 227 161 - background 0 - emphasis_0 248 139 159 - emphasis_1 137 220 235 - emphasis_2 203 166 247 - emphasis_3 0 - } - frame_highlight { - base 248 139 159 - background 0 - emphasis_0 203 166 247 - emphasis_1 248 139 159 - emphasis_2 248 139 159 - emphasis_3 248 139 159 - } - exit_code_success { - base 166 227 161 - background 0 - emphasis_0 137 220 235 - emphasis_1 86 95 137 - emphasis_2 203 166 247 - emphasis_3 122 162 247 - } - exit_code_error { - base 247 118 142 - background 0 - emphasis_0 249 226 175 - emphasis_1 0 - emphasis_2 0 - emphasis_3 0 - } - multiplayer_user_colors { - player_1 203 166 247 - player_2 122 162 247 - player_3 0 - player_4 249 226 175 - player_5 137 220 235 - player_6 0 - player_7 247 118 142 - player_8 0 - player_9 0 - player_10 0 - } - } -} diff --git a/aether/wallhaven.json b/aether/wallhaven.json deleted file mode 100644 index 585fc4d..0000000 --- a/aether/wallhaven.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apiKey": "", - "categories": "010", - "order": "desc", - "purity": "100", - "purityControlsEnabled": true, - "resolutions": "1920x1080", - "sorting": "date_added" -} diff --git a/hypr/aether-theme.conf b/hypr/aether-theme.conf deleted file mode 120000 index b9b3d23..0000000 --- a/hypr/aether-theme.conf +++ /dev/null @@ -1 +0,0 @@ -/home/nico/.config/aether/theme/hyprland-theme.conf \ No newline at end of file diff --git a/hypr/cursor/shapes.py b/hypr/cursor/shapes.py index d39eaec..90be878 100644 --- a/hypr/cursor/shapes.py +++ b/hypr/cursor/shapes.py @@ -6,7 +6,7 @@ name to (hotspot in that box, [svg frames]); more than one frame = animated. """ OUT = "#0b1a26" # outline -BLUE = "#1793d1" # accent (aether color for the rice) +BLUE = "#1793d1" # accent color for the rice (theme/colors.toml) LIGHT = "#e6f1f8" TRACK = "#2a4a63" RED = "#e5546b" diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 39e5eac..47852dd 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -98,8 +98,8 @@ general { layout = dwindle } -# Border-Farben von aether (wird bei jedem Theme-Wechsel neu generiert) -source = ~/.config/hypr/aether-theme.conf +# Border-Farben aus theme/colors.toml (wird bei jedem Theme-Wechsel neu generiert, siehe theme/render.py) +source = ~/.config/hypr/theme.conf decoration { rounding = 8 diff --git a/hypr/hyprland.lua b/hypr/hyprland.lua index 9bcc8b2..68b547b 100644 --- a/hypr/hyprland.lua +++ b/hypr/hyprland.lua @@ -133,12 +133,12 @@ hl.config({ -- ---------------------------------------------------------- --- Border-Farben von aether (wird bei jedem Theme-Wechsel neu generiert) --- Liest die von aether generierte Datei direkt bei jedem Config-Reload, --- damit ein Theme-Wechsel (der die Datei neu schreibt + reload triggert) --- weiterhin automatisch die Rahmenfarben aktualisiert. -local function read_aether_theme() - local path = (os.getenv("HOME") or "") .. "/.config/hypr/aether-theme.conf" +-- Border-Farben aus theme/colors.toml (wird bei jedem Theme-Wechsel neu generiert, siehe theme/render.py) +-- Liest die generierte Datei direkt bei jedem Config-Reload, damit ein +-- Theme-Wechsel (der die Datei neu schreibt + reload triggert) weiterhin +-- automatisch die Rahmenfarben aktualisiert. +local function read_theme_conf() + local path = (os.getenv("HOME") or "") .. "/.config/hypr/theme.conf" local f = io.open(path, "r") if not f then return nil end local content = f:read("*a") @@ -152,7 +152,7 @@ local function read_aether_theme() return { active1 = active1, active2 = active2, inactive = inactive } end -local aether = read_aether_theme() +local theme = read_theme_conf() hl.config({ general = { @@ -162,18 +162,18 @@ hl.config({ resize_on_border = true, allow_tearing = false, layout = "dwindle", - col = aether and { - active_border = { colors = { aether.active1, aether.active2 }, angle = 45 }, - inactive_border = aether.inactive, + col = theme and { + active_border = { colors = { theme.active1, theme.active2 }, angle = 45 }, + inactive_border = theme.inactive, } or nil, }, }) -if aether then +if theme then hl.config({ group = { col = { - border_active = { colors = { aether.active1, aether.active2 }, angle = 45 }, + border_active = { colors = { theme.active1, theme.active2 }, angle = 45 }, }, }, }) @@ -478,6 +478,19 @@ hl.window_rule({ scroll_touchpad = 1.5, }) +-- Workaround: every new kitty window has been coming up in real Hyprland +-- fullscreen (hasfullscreen=true, needs fullscreen() dispatched twice to +-- clear) regardless of workspace - root cause not found. "fullscreen = false" +-- is a no-op (that's just the default, it doesn't force anything); this +-- overrides both the internal and client-requested fullscreen state instead. +hl.window_rule({ + name = "no_fullscreen_kitty", + match = { + class = "^(kitty)$", + }, + fullscreen_state = "0 0", +}) + hl.window_rule({ name = "scroll_touchpad_0_2_276", match = { diff --git a/aether/theme/hyprland-theme.conf b/hypr/theme.conf similarity index 69% rename from aether/theme/hyprland-theme.conf rename to hypr/theme.conf index 3a6680b..4c78eaf 100644 --- a/aether/theme/hyprland-theme.conf +++ b/hypr/theme.conf @@ -1,5 +1,5 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/hyprland/theme.conf, not the output. +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/hyprland/theme.conf, not the output. $activeBorderColor1 = rgba(1793d1ff) $activeBorderColor2 = rgba(7aa2f7ff) diff --git a/kitty/aether-colors.conf b/kitty/aether-colors.conf deleted file mode 120000 index 66d3c44..0000000 --- a/kitty/aether-colors.conf +++ /dev/null @@ -1 +0,0 @@ -/home/nico/.config/aether/theme/kitty-colors.conf \ No newline at end of file diff --git a/kitty/kitty.conf b/kitty/kitty.conf index c8876ba..829f910 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,5 +1,5 @@ -# Farben von aether (wird bei jedem Theme-Wechsel neu generiert) -include ~/.config/aether/theme/kitty-colors.conf +# Farben aus theme/colors.toml (wird bei jedem Theme-Wechsel neu generiert, siehe theme/render.py) +include ~/.config/kitty/theme.conf # Transparenz background_opacity 0.85 diff --git a/kitty/theme.conf b/kitty/theme.conf new file mode 100644 index 0000000..e061b22 --- /dev/null +++ b/kitty/theme.conf @@ -0,0 +1,5 @@ +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/kitty/theme.conf, not the output. +background #1a1b26 +foreground #c0caf5 +cursor #c0caf5 diff --git a/mako/colors.ini b/mako/colors.ini index 494c2f6..5f019a6 100644 --- a/mako/colors.ini +++ b/mako/colors.ini @@ -1,5 +1,5 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/mako/colors.ini, not the output. +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/mako/colors.ini, not the output. # Included from ~/.config/mako/config. text-color=#c0caf5 diff --git a/mako/config b/mako/config index c44fb53..94200ae 100644 --- a/mako/config +++ b/mako/config @@ -1,6 +1,6 @@ -# Layout / behavior. Colors come from the active aether palette, not -# hardcoded here - see aether/custom/mako/colors.ini (template, edit -# that, not this include) and mako/colors.ini (generated output). +# Layout / behavior. Colors come from the active theme palette, not hardcoded +# here - see theme/templates/mako/colors.ini (template, edit that, not this +# include) and mako/colors.ini (generated output, see theme/render.py). include=~/.config/mako/colors.ini font=JetBrainsMono Nerd Font 11 diff --git a/quickshell/default/ThemeWidget.qml b/quickshell/default/ThemeWidget.qml new file mode 100644 index 0000000..53b2ce3 --- /dev/null +++ b/quickshell/default/ThemeWidget.qml @@ -0,0 +1,538 @@ +import QtQuick +import QtQuick.Layouts +import Quickshell +import Quickshell.Io +import Quickshell.Wayland +import Quickshell.Hyprland + +// Standalone widget (independent of Bar.qml), top-left corner of the primary screen. +// Replaces the "aether" GUI app: two buttons open a wallpaper picker and a color-role +// editor that write straight into theme/colors.toml and theme/wallpaper.py's archive, +// then theme/render.py re-renders every themed app's config and reloads it. +PanelWindow { + id: widget + // DP-1 is the main monitor in this rice (see Bar.qml's workspaceIds); fall back to + // whatever's first so the widget still shows up on a single-monitor setup. + screen: Quickshell.screens.find(function (s) { return s.name === "DP-1" }) || Quickshell.screens[0] + anchors { top: true; left: true } + margins { top: 10; left: 10 } + implicitWidth: row.implicitWidth + 16 + implicitHeight: 34 + color: "transparent" + WlrLayershell.namespace: "theme-widget" + // Bottom, not Top: this sits on the desktop, not over normal windows. The popups below + // stay on Top since they only show up while the widget itself is visibly reachable. + WlrLayershell.layer: WlrLayer.Bottom + + readonly property bool isGerman: Qt.locale().name.startsWith("de") + readonly property string themeDir: "/home/nico/.config/theme" + + property bool wallpaperOpen: false + property bool colorsOpen: false + property var wallpapers: [] + + // ---- color roles: key -> current hex, kept in sync with theme/colors.toml ---- + property var colorValues: ({}) + property string editingKey: "" + property string hexInput: "" + + readonly property var roleOrder: ["accent", "cursor", "foreground", "background", + "selection_foreground", "selection_background", + "color0", "color1", "color2", "color3", "color4", "color5", "color6", "color7", + "color8", "color9", "color10", "color11", "color12", "color13", "color14", "color15"] + + readonly property var roleLabels: ({ + accent: "Accent", cursor: "Cursor", foreground: "Foreground", background: "Background", + selection_foreground: isGerman ? "Auswahl (Text)" : "Selection (fg)", + selection_background: isGerman ? "Auswahl (Hintergrund)" : "Selection (bg)", + color0: "Color 0", color1: "Color 1", color2: "Color 2", color3: "Color 3", + color4: "Color 4", color5: "Color 5", color6: "Color 6", color7: "Color 7", + color8: "Color 8", color9: "Color 9", color10: "Color 10", color11: "Color 11", + color12: "Color 12", color13: "Color 13", color14: "Color 14", color15: "Color 15", + }) + + // A curated set of preset swatches for the color picker - independent of the current + // theme, so it always offers real alternatives instead of just the colors already in use. + readonly property var presetPalette: [ + "#f7768e", "#ff9e64", "#f9e2af", "#a6e3a1", "#73daca", "#89dceb", + "#7aa2f7", "#1793d1", "#7dcfff", "#bb9af7", "#cba6f7", "#f5c2e7", + "#e0af68", "#9ece6a", "#4fd6be", "#41a6b5", "#3d59a1", "#c0caf5", + "#565f89", "#414868", "#24283b", "#1a1b26", "#ffffff", "#e6e6e6", + ] + + function refreshColors() { colorsDump.running = true } + function refreshWallpapers() { wallpaperList.running = true } + + Process { + id: colorsDump + command: ["python3", widget.themeDir + "/render.py", "--dump"] + stdout: StdioCollector { id: colorsDumpCollector } + onExited: { + try { widget.colorValues = JSON.parse(colorsDumpCollector.text) } catch (e) {} + } + } + + Process { + id: colorsSet + stdout: StdioCollector {} + onExited: widget.refreshColors() + } + + Process { + id: wallpaperList + command: ["python3", widget.themeDir + "/wallpaper.py", "list"] + stdout: StdioCollector { id: wallpaperListCollector } + onExited: { + try { widget.wallpapers = JSON.parse(wallpaperListCollector.text) } catch (e) {} + } + } + + Process { + id: wallpaperApply + stdout: StdioCollector {} + onExited: widget.refreshWallpapers() + } + + Process { + id: wallpaperPick + command: ["python3", widget.themeDir + "/wallpaper.py", "pick"] + stdout: StdioCollector {} + onExited: widget.refreshWallpapers() + } + + Component.onCompleted: { + refreshColors() + refreshWallpapers() + } + + Rectangle { + anchors.fill: parent + radius: 10 + color: Qt.rgba(0.161, 0.204, 0.298, 0.14) + border.width: 1 + border.color: Qt.rgba(0.478, 0.635, 0.969, 0.4) + + Row { + id: row + anchors.centerIn: parent + spacing: 6 + leftPadding: 2 + rightPadding: 2 + + Rectangle { + width: 30; height: 26 + radius: 8 + color: (wallArea.containsMouse || widget.wallpaperOpen) ? "#1793d1" : "transparent" + + Text { + anchors.centerIn: parent + text: "" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 14 + color: (wallArea.containsMouse || widget.wallpaperOpen) ? "#0f111a" : "#7aa2f7" + } + + MouseArea { + id: wallArea + anchors.fill: parent + hoverEnabled: true + onClicked: { + widget.colorsOpen = false + widget.wallpaperOpen = !widget.wallpaperOpen + if (widget.wallpaperOpen) widget.refreshWallpapers() + } + } + } + + Rectangle { + width: 30; height: 26 + radius: 8 + color: (colorArea.containsMouse || widget.colorsOpen) ? "#1793d1" : "transparent" + + Text { + anchors.centerIn: parent + text: "" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 14 + color: (colorArea.containsMouse || widget.colorsOpen) ? "#0f111a" : "#cba6f7" + } + + MouseArea { + id: colorArea + anchors.fill: parent + hoverEnabled: true + onClicked: { + widget.wallpaperOpen = false + widget.colorsOpen = !widget.colorsOpen + if (widget.colorsOpen) { + widget.editingKey = "" + widget.refreshColors() + } + } + } + } + } + } + + // ================= WALLPAPER POPUP ================= + LazyLoader { + active: widget.wallpaperOpen + + PanelWindow { + id: wallWindow + screen: widget.screen + anchors { top: true; left: true } + margins { top: 48; left: 10 } + implicitWidth: 420 + implicitHeight: wallCol.implicitHeight + 24 + color: "transparent" + WlrLayershell.namespace: "theme-widget-wallpaper" + WlrLayershell.layer: WlrLayer.Top + + HyprlandFocusGrab { + windows: [ wallWindow ] + active: true + onCleared: widget.wallpaperOpen = false + } + + Rectangle { + anchors.fill: parent + radius: 12 + color: "#f01a1b26" + border.width: 1 + border.color: Qt.rgba(0.478, 0.635, 0.969, 0.35) + + ColumnLayout { + id: wallCol + anchors.fill: parent + anchors.margins: 12 + spacing: 8 + + Text { + text: widget.isGerman ? "Hintergrundbild" : "Wallpaper" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 15 + font.bold: true + color: "#c0caf5" + } + + Rectangle { + Layout.fillWidth: true + Layout.preferredHeight: 32 + radius: 8 + color: pickArea.containsMouse ? "#1793d1" : Qt.rgba(0.478, 0.635, 0.969, 0.15) + + Text { + anchors.centerIn: parent + text: " " + (widget.isGerman ? "Neues Bild wählen…" : "Choose new file…") + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 12 + color: pickArea.containsMouse ? "#0f111a" : "#c0caf5" + } + + MouseArea { + id: pickArea + anchors.fill: parent + hoverEnabled: true + onClicked: { + wallpaperPick.running = true + widget.wallpaperOpen = false + } + } + } + + Text { + visible: widget.wallpapers.length > 0 + text: widget.isGerman ? "Zuletzt verwendet" : "Recently used" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 11 + color: "#565f89" + } + + GridLayout { + Layout.fillWidth: true + columns: 3 + rowSpacing: 8 + columnSpacing: 8 + + Repeater { + model: widget.wallpapers + + Rectangle { + required property var modelData + Layout.preferredWidth: 128 + Layout.preferredHeight: 72 + radius: 8 + color: "#0f111a" + border.width: modelData.current ? 2 : 0 + border.color: "#1793d1" + clip: true + + Image { + anchors.fill: parent + anchors.margins: modelData.current ? 2 : 0 + source: "file://" + modelData.path + fillMode: Image.PreserveAspectCrop + asynchronous: true + sourceSize.width: 256 + } + + Rectangle { + visible: modelData.current + anchors { bottom: parent.bottom; right: parent.right; margins: 4 } + width: 16; height: 16 + radius: 8 + color: "#1793d1" + Text { + anchors.centerIn: parent + text: "" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 9 + color: "#0f111a" + } + } + + MouseArea { + anchors.fill: parent + onClicked: { + if (!modelData.current) { + wallpaperApply.command = ["python3", widget.themeDir + "/wallpaper.py", "apply", modelData.path] + wallpaperApply.running = true + } + widget.wallpaperOpen = false + } + } + } + } + } + } + } + } + } + + // ================= COLORS POPUP ================= + LazyLoader { + active: widget.colorsOpen + + PanelWindow { + id: colorsWindow + screen: widget.screen + anchors { top: true; left: true } + margins { top: 48; left: 10 } + implicitWidth: 340 + implicitHeight: colorsCol.implicitHeight + 24 + color: "transparent" + WlrLayershell.namespace: "theme-widget-colors" + WlrLayershell.layer: WlrLayer.Top + + HyprlandFocusGrab { + windows: [ colorsWindow ] + active: true + onCleared: widget.colorsOpen = false + } + + Rectangle { + anchors.fill: parent + radius: 12 + color: "#f01a1b26" + border.width: 1 + border.color: Qt.rgba(0.478, 0.635, 0.969, 0.35) + + ColumnLayout { + id: colorsCol + anchors.fill: parent + anchors.margins: 12 + spacing: 8 + + // ---- step 1: pick which role to edit ---- + ColumnLayout { + visible: widget.editingKey === "" + Layout.fillWidth: true + spacing: 8 + + Text { + text: widget.isGerman ? "Farbe wählen" : "Choose a color" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 15 + font.bold: true + color: "#c0caf5" + } + + GridLayout { + Layout.fillWidth: true + columns: 2 + rowSpacing: 4 + columnSpacing: 8 + + Repeater { + model: widget.roleOrder + + Rectangle { + required property string modelData + Layout.fillWidth: true + Layout.preferredHeight: 28 + radius: 6 + color: roleArea.containsMouse ? Qt.rgba(0.478, 0.635, 0.969, 0.18) : "transparent" + + RowLayout { + anchors.fill: parent + anchors.margins: 4 + spacing: 6 + + Rectangle { + width: 16; height: 16 + radius: 4 + color: widget.colorValues[modelData] || "#000000" + border.width: 1 + border.color: Qt.rgba(1, 1, 1, 0.2) + } + Text { + Layout.fillWidth: true + text: widget.roleLabels[modelData] + elide: Text.ElideRight + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 11 + color: "#c0caf5" + } + } + + MouseArea { + id: roleArea + anchors.fill: parent + hoverEnabled: true + onClicked: { + widget.editingKey = modelData + widget.hexInput = widget.colorValues[modelData] || "" + } + } + } + } + } + } + + // ---- step 2: pick a new color for widget.editingKey ---- + ColumnLayout { + visible: widget.editingKey !== "" + Layout.fillWidth: true + spacing: 8 + + RowLayout { + Layout.fillWidth: true + + Rectangle { + width: 22; height: 22 + radius: 6 + color: "transparent" + Text { + anchors.centerIn: parent + text: "" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 13 + color: "#7aa2f7" + } + MouseArea { anchors.fill: parent; onClicked: widget.editingKey = "" } + } + Text { + Layout.fillWidth: true + text: widget.roleLabels[widget.editingKey] || "" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 15 + font.bold: true + color: "#c0caf5" + } + Rectangle { + width: 28; height: 28 + radius: 6 + color: previewValid ? widget.hexInput : "#000000" + border.width: 1 + border.color: Qt.rgba(1, 1, 1, 0.25) + readonly property bool previewValid: /^#[0-9a-fA-F]{6}$/.test(widget.hexInput) + } + } + + GridLayout { + Layout.fillWidth: true + columns: 6 + rowSpacing: 6 + columnSpacing: 6 + + Repeater { + model: widget.presetPalette + + Rectangle { + required property string modelData + Layout.preferredWidth: 32 + Layout.preferredHeight: 32 + radius: 6 + color: modelData + border.width: widget.hexInput.toLowerCase() === modelData ? 2 : 1 + border.color: widget.hexInput.toLowerCase() === modelData ? "#ffffff" : Qt.rgba(1, 1, 1, 0.2) + + MouseArea { + anchors.fill: parent + onClicked: widget.hexInput = modelData + } + } + } + } + + RowLayout { + Layout.fillWidth: true + spacing: 8 + + Rectangle { + Layout.fillWidth: true + Layout.preferredHeight: 30 + radius: 6 + color: "#0f111a" + border.width: 1 + border.color: Qt.rgba(0.478, 0.635, 0.969, 0.3) + + TextInput { + anchors.fill: parent + anchors.margins: 6 + text: widget.hexInput + onTextEdited: widget.hexInput = text + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 12 + color: "#c0caf5" + selectByMouse: true + maximumLength: 7 + } + } + + Rectangle { + Layout.preferredWidth: 90 + Layout.preferredHeight: 30 + radius: 6 + readonly property bool valid: /^#[0-9a-fA-F]{6}$/.test(widget.hexInput) + color: !valid ? Qt.rgba(0.478, 0.635, 0.969, 0.1) : (applyArea.containsMouse ? "#1793d1" : Qt.rgba(0.478, 0.635, 0.969, 0.25)) + opacity: valid ? 1.0 : 0.5 + + Text { + anchors.centerIn: parent + text: widget.isGerman ? "Übernehmen" : "Apply" + font.family: "JetBrainsMono Nerd Font" + font.pixelSize: 11 + color: applyArea.containsMouse ? "#0f111a" : "#c0caf5" + } + + MouseArea { + id: applyArea + anchors.fill: parent + hoverEnabled: true + enabled: parent.valid + onClicked: { + colorsSet.command = ["python3", widget.themeDir + "/render.py", "--set", widget.editingKey, widget.hexInput] + colorsSet.running = true + widget.editingKey = "" + } + } + } + } + } + } + } + } + } +} diff --git a/quickshell/default/shell.qml b/quickshell/default/shell.qml index a19d6c8..c505012 100644 --- a/quickshell/default/shell.qml +++ b/quickshell/default/shell.qml @@ -4,4 +4,5 @@ import Quickshell ShellRoot { Bar {} + ThemeWidget {} } diff --git a/rofi/aether-colors.rasi b/rofi/aether-colors.rasi deleted file mode 120000 index d65f679..0000000 --- a/rofi/aether-colors.rasi +++ /dev/null @@ -1 +0,0 @@ -/home/nico/.config/aether/theme/rofi-theme.rasi \ No newline at end of file diff --git a/rofi/arch-blue.rasi b/rofi/arch-blue.rasi index a25a82f..b5f3d6a 100644 --- a/rofi/arch-blue.rasi +++ b/rofi/arch-blue.rasi @@ -1,8 +1,8 @@ /* Custom Rofi Theme */ /* Arch + Productivity + Anime/Gaming balance */ -/* Farben von aether (wird bei jedem Theme-Wechsel neu generiert) */ -@import "~/.config/rofi/aether-colors.rasi" +/* Farben aus theme/colors.toml (wird bei jedem Theme-Wechsel neu generiert, siehe theme/render.py) */ +@import "~/.config/rofi/theme.rasi" * { background-color: transparent; diff --git a/aether/theme/rofi-theme.rasi b/rofi/theme.rasi similarity index 59% rename from aether/theme/rofi-theme.rasi rename to rofi/theme.rasi index c831006..9a43ec3 100644 --- a/aether/theme/rofi-theme.rasi +++ b/rofi/theme.rasi @@ -1,5 +1,5 @@ -/* Generated by aether from the active palette. - Edit the template at ~/.config/aether/custom/rofi/theme.rasi, not the output. */ +/* Generated by theme/render.py from the active palette. + Edit the template at ~/.config/theme/templates/rofi/theme.rasi, not the output. */ * { bg: rgba(15, 17, 26, 0.92); bg-alt: rgba(26, 27, 38, 0.92); diff --git a/aether/theme/colors.toml b/theme/colors.toml similarity index 100% rename from aether/theme/colors.toml rename to theme/colors.toml diff --git a/theme/render.py b/theme/render.py new file mode 100755 index 0000000..f08ec2a --- /dev/null +++ b/theme/render.py @@ -0,0 +1,118 @@ +#!/usr/bin/env python3 +"""Renders theme/colors.toml into every app's real config, replacing the aether GUI app. + + render.py re-render every template from the current palette and reload apps + render.py --no-reload same, but skip reloading apps (used right after --set, which reloads itself) + render.py --dump print every color as JSON (used by ThemeWidget.qml) + render.py --get KEY print one color (e.g. for shell scripts) + render.py --set KEY VALUE [KEY VALUE ...] change one or more colors in colors.toml, re-render, reload + +Templates live in theme/templates//{config.json,template}: config.json names the +template file and the destination it gets rendered to (~ expanded). Placeholders in a +template are {key}, {key.strip} (hex without '#'), or {key.rgba:ALPHA}. +""" +import json +import os +import re +import subprocess +import sys +import tomllib + +HERE = os.path.dirname(os.path.abspath(__file__)) +COLORS = os.path.join(HERE, "colors.toml") +TEMPLATES = os.path.join(HERE, "templates") + +PLACEHOLDER = re.compile(r"\{([a-zA-Z0-9_]+)(?:\.([a-zA-Z0-9_]+))?(?::([^}]+))?\}") + + +def load_colors(): + with open(COLORS, "rb") as f: + return tomllib.load(f) + + +def hex_to_rgb(hex_color): + h = hex_color.lstrip("#") + return tuple(int(h[i:i + 2], 16) for i in (0, 2, 4)) + + +def substitute(text, colors): + def repl(m): + key, fmt, arg = m.group(1), m.group(2), m.group(3) + if key not in colors: + sys.exit(f"render.py: unknown color key '{key}' in template") + value = colors[key] + if fmt is None: + return value + if fmt == "strip": + return value.lstrip("#") + if fmt == "rgba": + r, g, b = hex_to_rgb(value) + return f"rgba({r}, {g}, {b}, {arg})" + sys.exit(f"render.py: unknown placeholder format '.{fmt}' in template") + return PLACEHOLDER.sub(repl, text) + + +def render_all(colors): + for app in sorted(os.listdir(TEMPLATES)): + app_dir = os.path.join(TEMPLATES, app) + cfg_path = os.path.join(app_dir, "config.json") + if not os.path.isfile(cfg_path): + continue + cfg = json.load(open(cfg_path)) + template = open(os.path.join(app_dir, cfg["template"])).read() + dest = os.path.expanduser(cfg["destination"]) + os.makedirs(os.path.dirname(dest), exist_ok=True) + open(dest, "w").write(substitute(template, colors)) + print(f"rendered {app} -> {dest}") + + +def reload_apps(): + subprocess.run(["hyprctl", "reload"], check=False, capture_output=True) + subprocess.run(["makoctl", "reload"], check=False, capture_output=True) + subprocess.run(["pkill", "--signal", "USR1", "-x", "kitty"], check=False, capture_output=True) + + +def set_colors(pairs): + colors = load_colors() + text = open(COLORS).read() + for key, value in pairs: + if key not in colors: + sys.exit(f"render.py: unknown color key '{key}'") + if not re.fullmatch(r"#[0-9a-fA-F]{6}", value): + sys.exit(f"render.py: '{value}' is not a #rrggbb color") + new_text, n = re.subn(rf"(?m)^{re.escape(key)}\s*=\s*\"#[0-9a-fA-F]{{6}}\"", + f'{key} = "{value.lower()}"', text) + if n != 1: + sys.exit(f"render.py: could not find a single '{key} = \"...\"' line to replace") + text = new_text + open(COLORS, "w").write(text) + + +def main(): + args = sys.argv[1:] + if args[:1] == ["--dump"]: + print(json.dumps(load_colors())) + return + if args[:1] == ["--get"]: + colors = load_colors() + key = args[1] + if key not in colors: + sys.exit(f"render.py: unknown color key '{key}'") + print(colors[key]) + return + if args[:1] == ["--set"]: + rest = args[1:] + if len(rest) % 2 != 0 or not rest: + sys.exit("usage: render.py --set KEY VALUE [KEY VALUE ...]") + pairs = list(zip(rest[0::2], rest[1::2])) + set_colors(pairs) + render_all(load_colors()) + reload_apps() + return + render_all(load_colors()) + if "--no-reload" not in args: + reload_apps() + + +if __name__ == "__main__": + main() diff --git a/theme/templates/hyprland/config.json b/theme/templates/hyprland/config.json new file mode 100644 index 0000000..a768e8a --- /dev/null +++ b/theme/templates/hyprland/config.json @@ -0,0 +1,4 @@ +{ + "template": "theme.conf", + "destination": "~/.config/hypr/theme.conf" +} diff --git a/aether/custom/hyprland/theme.conf b/theme/templates/hyprland/theme.conf similarity index 71% rename from aether/custom/hyprland/theme.conf rename to theme/templates/hyprland/theme.conf index 6768dc7..19dfcd7 100644 --- a/aether/custom/hyprland/theme.conf +++ b/theme/templates/hyprland/theme.conf @@ -1,5 +1,5 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/hyprland/theme.conf, not the output. +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/hyprland/theme.conf, not the output. $activeBorderColor1 = rgba({color4.strip}ff) $activeBorderColor2 = rgba({color12.strip}ff) diff --git a/theme/templates/kitty/config.json b/theme/templates/kitty/config.json new file mode 100644 index 0000000..fa7a66c --- /dev/null +++ b/theme/templates/kitty/config.json @@ -0,0 +1,4 @@ +{ + "template": "theme.conf", + "destination": "~/.config/kitty/theme.conf" +} diff --git a/theme/templates/kitty/theme.conf b/theme/templates/kitty/theme.conf new file mode 100644 index 0000000..79d3e85 --- /dev/null +++ b/theme/templates/kitty/theme.conf @@ -0,0 +1,5 @@ +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/kitty/theme.conf, not the output. +background {background} +foreground {foreground} +cursor {cursor} diff --git a/aether/custom/mako/colors.ini b/theme/templates/mako/colors.ini similarity index 60% rename from aether/custom/mako/colors.ini rename to theme/templates/mako/colors.ini index 28a4422..af78144 100644 --- a/aether/custom/mako/colors.ini +++ b/theme/templates/mako/colors.ini @@ -1,5 +1,5 @@ -# Generated by aether from the active palette. -# Edit the template at ~/.config/aether/custom/mako/colors.ini, not the output. +# Generated by theme/render.py from the active palette. +# Edit the template at ~/.config/theme/templates/mako/colors.ini, not the output. # Included from ~/.config/mako/config. text-color={foreground} diff --git a/aether/custom/mako/config.json b/theme/templates/mako/config.json similarity index 100% rename from aether/custom/mako/config.json rename to theme/templates/mako/config.json diff --git a/theme/templates/rofi/config.json b/theme/templates/rofi/config.json new file mode 100644 index 0000000..e4de93f --- /dev/null +++ b/theme/templates/rofi/config.json @@ -0,0 +1,4 @@ +{ + "template": "theme.rasi", + "destination": "~/.config/rofi/theme.rasi" +} diff --git a/aether/custom/rofi/theme.rasi b/theme/templates/rofi/theme.rasi similarity index 60% rename from aether/custom/rofi/theme.rasi rename to theme/templates/rofi/theme.rasi index e1c463e..9e06110 100644 --- a/aether/custom/rofi/theme.rasi +++ b/theme/templates/rofi/theme.rasi @@ -1,5 +1,5 @@ -/* Generated by aether from the active palette. - Edit the template at ~/.config/aether/custom/rofi/theme.rasi, not the output. */ +/* Generated by theme/render.py from the active palette. + Edit the template at ~/.config/theme/templates/rofi/theme.rasi, not the output. */ * { bg: rgba(15, 17, 26, 0.92); bg-alt: {background.rgba:0.92}; diff --git a/theme/wallpaper.py b/theme/wallpaper.py new file mode 100755 index 0000000..b421adc --- /dev/null +++ b/theme/wallpaper.py @@ -0,0 +1,129 @@ +#!/usr/bin/env python3 +"""Manages the desktop wallpaper (~/.config/hypr/wallpaper.png, loaded by swaybg). + + wallpaper.py list JSON array of previously used wallpapers (newest first), + each {id, path, added, current}; "path" is directly usable + as a QML Image source + wallpaper.py apply archive the current wallpaper, make the new one + wallpaper.py pick open a native file picker, then apply the chosen file + wallpaper.py remove delete one archived wallpaper (refuses the current one) + +The picker button in the ThemeWidget calls "list" to fill its gallery of recommendations, +"pick" for "choose a new file", and "apply" again when a gallery entry is clicked. +""" +import hashlib +import json +import os +import shutil +import subprocess +import sys +import time + +ACTIVE = os.path.expanduser("~/.config/hypr/wallpaper.png") +ARCHIVE = os.path.expanduser("~/.local/share/quickshell/wallpapers") +MANIFEST = os.path.join(ARCHIVE, "manifest.json") + + +def load_manifest(): + try: + return json.load(open(MANIFEST)) + except (OSError, json.JSONDecodeError): + return [] + + +def save_manifest(entries): + os.makedirs(ARCHIVE, exist_ok=True) + json.dump(entries, open(MANIFEST, "w"), indent=1) + + +def sha256(path): + h = hashlib.sha256() + with open(path, "rb") as f: + for chunk in iter(lambda: f.read(1 << 20), b""): + h.update(chunk) + return h.hexdigest() + + +def archive_current(entries): + """Copies the currently active wallpaper into the archive, if it isn't there already.""" + if not os.path.isfile(ACTIVE): + return + digest = sha256(ACTIVE) + if any(e["sha256"] == digest for e in entries): + return + os.makedirs(ARCHIVE, exist_ok=True) + next_id = max([e["id"] for e in entries], default=0) + 1 + ext = os.path.splitext(ACTIVE)[1] or ".png" + dest = os.path.join(ARCHIVE, f"{next_id:04d}{ext}") + shutil.copy2(ACTIVE, dest) + entries.append({"id": next_id, "file": os.path.basename(dest), "sha256": digest, + "added": time.strftime("%Y-%m-%d %H:%M")}) + + +def restart_swaybg(): + subprocess.run(["pkill", "-x", "swaybg"], check=False, capture_output=True) + subprocess.Popen(["swaybg", "-i", ACTIVE, "-m", "fill"], + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, + start_new_session=True) + + +def cmd_list(): + entries = load_manifest() + current = sha256(ACTIVE) if os.path.isfile(ACTIVE) else None + out = [{"id": e["id"], "path": os.path.join(ARCHIVE, e["file"]), "added": e["added"], + "current": e["sha256"] == current} for e in entries] + out.sort(key=lambda e: -e["id"]) + print(json.dumps(out)) + + +def cmd_apply(path): + path = os.path.expanduser(path) + if not os.path.isfile(path): + sys.exit(f"wallpaper.py: no such file: {path}") + entries = load_manifest() + archive_current(entries) + shutil.copy2(path, ACTIVE) + save_manifest(entries) + restart_swaybg() + + +def cmd_pick(): + result = subprocess.run( + ["zenity", "--file-selection", "--title=Wallpaper wählen", + "--file-filter=Images | *.png *.jpg *.jpeg *.webp *.bmp"], + capture_output=True, text=True) + path = result.stdout.strip() + if result.returncode != 0 or not path: + return # cancelled + cmd_apply(path) + + +def cmd_remove(id_str): + wanted = int(id_str) + entries = load_manifest() + current = sha256(ACTIVE) if os.path.isfile(ACTIVE) else None + match = next((e for e in entries if e["id"] == wanted), None) + if match is None: + sys.exit(f"wallpaper.py: no archived wallpaper with id {wanted}") + if match["sha256"] == current: + sys.exit("wallpaper.py: refusing to remove the currently active wallpaper") + os.remove(os.path.join(ARCHIVE, match["file"])) + save_manifest([e for e in entries if e["id"] != wanted]) + + +def main(): + args = sys.argv[1:] + if args[:1] == ["list"]: + cmd_list() + elif args[:1] == ["apply"] and len(args) == 2: + cmd_apply(args[1]) + elif args[:1] == ["pick"]: + cmd_pick() + elif args[:1] == ["remove"] and len(args) == 2: + cmd_remove(args[1]) + else: + sys.exit(__doc__) + + +if __name__ == "__main__": + main() diff --git a/waybar/aether-colors.css b/waybar/aether-colors.css deleted file mode 120000 index 268d64a..0000000 --- a/waybar/aether-colors.css +++ /dev/null @@ -1 +0,0 @@ -/home/nico/.config/aether/theme/waybar-colors.css \ No newline at end of file