From c21a2834b75acc81c5e92e8ed7cb5ea3b7e1b9b7 Mon Sep 17 00:00:00 2001 From: funman300 Date: Fri, 1 May 2026 09:41:00 -0700 Subject: [PATCH] revert tray drawer feature and remove mouse-battery module The tray drawer added complexity (drawer config, custom chevron module, state-feedback CSS) for what amounts to a small visual refinement. Removed in favour of the original always-visible tray. The mouse-battery indicator was also removed from the bar. Deletes: - waybar/mouse-battery.sh + symlink + install.sh entry - group/tray-drawer + custom/mouse-battery blocks in config.jsonc - #custom-tray-arrow rules from style.css - docs/superpowers/{specs,plans} for the drawer feature Co-Authored-By: Claude Opus 4.7 (1M context) --- .../plans/2026-04-30-waybar-tray-drawer.md | 190 ------------------ .../2026-04-30-waybar-tray-drawer-design.md | 92 --------- install.sh | 1 - waybar/config.jsonc | 24 +-- waybar/mouse-battery.sh | 10 - waybar/style.css | 10 - 6 files changed, 1 insertion(+), 326 deletions(-) delete mode 100644 docs/superpowers/plans/2026-04-30-waybar-tray-drawer.md delete mode 100644 docs/superpowers/specs/2026-04-30-waybar-tray-drawer-design.md delete mode 100755 waybar/mouse-battery.sh diff --git a/docs/superpowers/plans/2026-04-30-waybar-tray-drawer.md b/docs/superpowers/plans/2026-04-30-waybar-tray-drawer.md deleted file mode 100644 index 69d053f..0000000 --- a/docs/superpowers/plans/2026-04-30-waybar-tray-drawer.md +++ /dev/null @@ -1,190 +0,0 @@ -# Waybar Tray Drawer Implementation Plan - -> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. - -**Goal:** Wrap the waybar `tray` module in a `group/drawer` so its icons collapse behind a chevron and expand on click. - -**Architecture:** Pure waybar config + CSS — no scripting. The drawer module is built into waybar ≥ 0.10 (installed: 0.15.0). The chevron is a tiny `custom/` module rendering one Nerd Font glyph; CSS brightens its color when the drawer enters its `expanded` state. - -**Tech Stack:** waybar 0.15.0, JetBrainsMono Nerd Font, GTK CSS. - -**Spec:** `docs/superpowers/specs/2026-04-30-waybar-tray-drawer-design.md` - -**Verification model:** Waybar configs aren't unit-testable. Verification is: (1) JSONC parses, (2) waybar reloads without errors in stderr, (3) visual check that the arrow appears, click expands the tray, click again collapses. Each task ends with a reload + visual check. - -**Glyph note:** The chevron is `` (`nf-fa-chevron_right`, U+F054). Several editing tools render `` (U+F053) and `` (U+F054) identically — when copy-pasting, verify the codepoint with `python3 -c "print(hex(ord(open('file').read()[OFFSET])))"` if anything looks wrong. - ---- - -## File Structure - -- **Modify:** `waybar/config.jsonc` — replace `"tray"` reference in `modules-right`, add two new module definitions (`group/tray-drawer`, `custom/tray-arrow`). -- **Modify:** `waybar/style.css` — add `#custom-tray-arrow` styling and a brightened-color rule keyed off the drawer's `expanded` class. - -No new files. No theme changes — reuses existing `@tn-fg-muted` color variable from `theme/colors.css`. - ---- - -## Task 1: Wire up the drawer (functional, unstyled) - -After this task, clicking the chevron expands/collapses the tray. Arrow looks plain (no rotation, default color) — that's fine, polish comes in Task 2. - -**Files:** -- Modify: `waybar/config.jsonc` (lines 8 and 72-74 in current state) - -- [ ] **Step 1: Replace `"tray"` in `modules-right` with `"group/tray-drawer"`** - -In `waybar/config.jsonc`, change line 8 from: - -```jsonc -"modules-right": ["cpu", "temperature", "custom/power-profile", "custom/fan-profile", "pulseaudio", "network", "battery", "custom/mouse-battery", "tray"], -``` - -to: - -```jsonc -"modules-right": ["cpu", "temperature", "custom/power-profile", "custom/fan-profile", "pulseaudio", "network", "battery", "custom/mouse-battery", "group/tray-drawer"], -``` - -- [ ] **Step 2: Add the `group/tray-drawer` and `custom/tray-arrow` definitions** - -The existing `tray` module definition is around lines 72-74: - -```jsonc -"tray": { - "spacing": 8 - }, -``` - -Leave that block as-is (the `tray` module still exists, it's just nested inside the group now). Immediately *after* the closing `}` of the `tray` block (and before the next module), insert: - -```jsonc - "group/tray-drawer": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 200, - "transition-left-to-right": true, - "click-to-reveal": true - }, - "modules": ["custom/tray-arrow", "tray"] - }, - - "custom/tray-arrow": { - "format": "", - "tooltip": false - }, -``` - -- [ ] **Step 3: Validate JSONC parses** - -Run: -```bash -python3 -c "import json, re, sys; s=open('waybar/config.jsonc').read(); s=re.sub(r'//.*','',s); json.loads(s); print('ok')" -``` - -Expected output: `ok` - -If it errors, fix the syntax (most common: trailing comma on last key in an object, or missing comma between objects). - -- [ ] **Step 4: Reload waybar and check stderr** - -Run waybar in foreground for 3 seconds to capture any startup errors: -```bash -pkill waybar; sleep 0.5; timeout 3 waybar 2>&1 | tee /tmp/waybar-check.log; pkill waybar -``` - -Expected: no lines containing `error`, `Error`, `failed`, or `Failed` in `/tmp/waybar-check.log` related to `group/tray-drawer`, `custom/tray-arrow`, or JSON parsing. (Module-not-found warnings for unrelated optional things are fine.) - -Then start waybar normally in the background: -```bash -nohup waybar >/dev/null 2>&1 & -disown -``` - -- [ ] **Step 5: Visual check** - -Look at the bar: -- The right edge should now show a chevron glyph (``) where the tray icons used to be. -- Click the chevron → tray icons should slide out to its right. -- Click the chevron again → icons slide back, only chevron remains. -- Existing tray icons (right-click, scroll, etc.) should still respond normally while expanded. - -If the chevron renders as a tofu box (`􏿽`), the Nerd Font glyph isn't loading — re-verify the codepoint is U+F054 (see Glyph note in plan header). - -- [ ] **Step 6: Commit** - -```bash -git add waybar/config.jsonc -git commit -m "waybar: collapse tray icons behind a click-to-reveal drawer" -``` - ---- - -## Task 2: Style the chevron (color shift feedback) - -After this task, the chevron is muted (matches inactive workspace buttons) and brightens to full foreground when expanded so the user gets visual feedback that the drawer state changed. - -**Files:** -- Modify: `waybar/style.css` (append new rules at end of file) - -- [ ] **Step 1: Append chevron rules to `waybar/style.css`** - -Add to the end of the file (after the existing `#temperature.critical` rule): - -```css - -#custom-tray-arrow { - padding: 0 12px; - color: @tn-fg-muted; - transition: color 200ms ease; -} - -#group-tray-drawer.expanded #custom-tray-arrow { - color: @tn-fg; -} -``` - -The `padding: 0 12px` matches the existing right-side modules (line 25 of style.css). `@tn-fg-muted` matches the unfocused-workspace color (line 15) — the arrow reads as a control, not a status icon. When the drawer is open, the arrow brightens to `@tn-fg` (full foreground) over 200 ms — same duration as the drawer's slide. - -> **Note:** An earlier draft of this plan used `transform: rotate(180deg)` for visual feedback. GTK 3 CSS (which waybar uses) treats `transform` as a fatal parse error, so the rotation approach was replaced with a color shift — matching the existing convention in `style.css` for state feedback (battery/cpu/temperature). - -- [ ] **Step 2: Reload waybar** - -```bash -pkill -SIGUSR2 waybar -``` - -(`SIGUSR2` reloads config + CSS without restarting; same signal already used elsewhere in this repo.) - -- [ ] **Step 3: Visual check** - -- Chevron is muted (matches the unfocused workspace button color). -- Click it → tray slides in and the chevron brightens to full foreground. -- Click again → tray collapses and the chevron dims back. -- Spacing around the chevron looks consistent with neighboring modules. - -If the color shift doesn't happen, the GTK class name on the expanded group might differ. Inspect with: -```bash -GTK_DEBUG=interactive waybar & -``` -…then in the GTK Inspector, click the chevron in expanded state and check what class is applied to the parent group (should be `expanded`; if it's something else like `revealed`, update the CSS selector to match). - -- [ ] **Step 4: Commit** - -```bash -git add waybar/style.css -git commit -m "waybar: style tray drawer chevron with color-shift feedback" -``` - ---- - -## Final verification - -- [ ] **Bar starts cleanly on next login.** Log out and back in (or restart niri), confirm the bar comes up with the drawer collapsed by default and no errors in `journalctl --user -u waybar` (if waybar is run as a user unit) or `nohup.out` (if started by niri config). -- [ ] **No regressions on other modules.** Workspaces, clock, cpu/temp, audio, network, battery, mouse battery all render and respond to clicks/scrolls as before. -- [ ] **Spec requirements satisfied:** - - Default state collapsed ✓ (drawer's default behavior) - - Click-to-toggle ✓ (`click-to-reveal: true`) - - 200 ms slide animation ✓ (`transition-duration: 200`) - - Tray icons retain their normal interactions ✓ (drawer doesn't intercept events on revealed children) - - No state persistence across waybar restarts ✓ (drawer always starts collapsed — no persistence layer added) diff --git a/docs/superpowers/specs/2026-04-30-waybar-tray-drawer-design.md b/docs/superpowers/specs/2026-04-30-waybar-tray-drawer-design.md deleted file mode 100644 index ed33abf..0000000 --- a/docs/superpowers/specs/2026-04-30-waybar-tray-drawer-design.md +++ /dev/null @@ -1,92 +0,0 @@ -# Waybar Tray Drawer Design - -**Date:** 2026-04-30 -**Status:** Approved - -## Summary - -Add a Windows-style "show hidden icons" arrow to the waybar system tray. By default the tray icons are collapsed behind a single chevron glyph; clicking the chevron expands them inline to its right with a short slide animation. Clicking again collapses them back. No custom scripting — implemented entirely with waybar's built-in `group/drawer` module. - -## Current Behaviour - -The `tray` module sits at the rightmost end of `modules-right` and always shows every status-icon a running program emits. When several apps are running (Discord, Steam, mouse manager, syncthing, etc.) the tray takes up significant horizontal space. - -## Target Behaviour - -``` -collapsed: ... battery [>] -expanded: ... battery [<] [icon][icon][icon] -``` - -- Default state on bar startup: collapsed (only the arrow visible). -- Click the arrow → tray icons appear to its right, ~200 ms slide. -- Click the arrow again → tray icons collapse. -- Tray icons keep their normal click/scroll behaviour while expanded. -- State is per-bar-session; no persistence across waybar restarts. - -## Implementation - -### `waybar/config.jsonc` - -Replace `"tray"` in `modules-right` with `"group/tray-drawer"`. Add the group definition and the chevron module: - -```jsonc -"modules-right": [ - "cpu", "temperature", "custom/power-profile", "custom/fan-profile", - "pulseaudio", "network", "battery", "custom/mouse-battery", - "group/tray-drawer" -], - -"group/tray-drawer": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 200, - "transition-left-to-right": true, - "click-to-reveal": true - }, - "modules": ["custom/tray-arrow", "tray"] -}, - -"custom/tray-arrow": { - "format": "", - "tooltip": false -} -``` - -The arrow is the first module in the group, so it stays visible when collapsed; `tray` is revealed/hidden by the drawer. - -Glyph `` is `nf-fa-chevron_right` from Nerd Fonts. Pointing right when collapsed reads as "more stuff is hidden over here — click to reveal". The arrow does not rotate when expanded — GTK 3 CSS (which waybar uses) does not support the `transform` property and treats it as a fatal parse error. Instead, the chevron's color brightens from muted to full foreground as visual feedback that the drawer is open. - -### `waybar/style.css` - -Add a base style for the chevron and a brightened-color rule keyed off the drawer's expanded state: - -```css -#custom-tray-arrow { - padding: 0 12px; - color: @tn-fg-muted; - transition: color 200ms ease; -} - -#group-tray-drawer.expanded #custom-tray-arrow { - color: @tn-fg; -} -``` - -`@tn-fg-muted` matches the unfocused-workspace color elsewhere in the bar — the chevron reads as an inactive control, not a status icon. When the drawer is open, the arrow brightens to `@tn-fg` (full foreground) over 200 ms — same duration as the drawer's slide. This matches the existing `style.css` pattern of using color shifts (not transforms) to convey state, e.g. `battery.warning`, `cpu.critical`, `temperature.warm`. - -### Compatibility - -`click-to-reveal` was added in waybar 0.10. Installed version is 0.15.0 — supported. - -## Files Touched - -- `waybar/config.jsonc` — replace `tray` entry, add two module definitions -- `waybar/style.css` — add `#custom-tray-arrow` rules - -## Out of Scope - -- Persisting expanded/collapsed state across waybar restarts -- Per-icon hide/show (waybar's `tray` module is monolithic — all icons or none) -- Animating the surrounding modules; they shift left to make room as the drawer opens, which is unavoidable with waybar's drawer -- Extending the same pattern to other right-side modules diff --git a/install.sh b/install.sh index 1f79d46..f85c1a6 100755 --- a/install.sh +++ b/install.sh @@ -25,7 +25,6 @@ ln -sf "$(pwd)/networkmanager-dmenu/config.ini" ~/.config/networkmanager-dmenu/c ln -sf "$(pwd)/niri/config.kdl" ~/.config/niri/config.kdl ln -sf "$(pwd)/waybar/config.jsonc" ~/.config/waybar/config.jsonc ln -sf "$(pwd)/waybar/style.css" ~/.config/waybar/style.css -ln -sf "$(pwd)/waybar/mouse-battery.sh" ~/.config/waybar/mouse-battery.sh mkdir -p ~/.config/theme ln -sf "$(pwd)/theme/colors.css" ~/.config/theme/colors.css ln -sf "$(pwd)/wofi/config" ~/.config/wofi/config diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 6187893..88473ef 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -5,14 +5,7 @@ "modules-left": ["niri/workspaces"], "modules-center": ["custom/clock"], - "modules-right": ["cpu", "temperature", "custom/power-profile", "custom/fan-profile", "pulseaudio", "network", "battery", "custom/mouse-battery", "group/tray-drawer"], - "custom/mouse-battery": { - "exec": "~/.config/waybar/mouse-battery.sh", - "interval": 60, - "format": " {output}", - "tooltip": false - }, - + "modules-right": ["cpu", "temperature", "custom/power-profile", "custom/fan-profile", "pulseaudio", "network", "battery", "tray"], "cpu": { "format": " {usage}%", "format-tooltip": "{usage}% total\n{icon0} {icon1} {icon2} {icon3}\n{icon4} {icon5} {icon6} {icon7}\n{icon8} {icon9} {icon10} {icon11}", @@ -73,21 +66,6 @@ "spacing": 8 }, - "group/tray-drawer": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 200, - "transition-left-to-right": true, - "click-to-reveal": true - }, - "modules": ["custom/tray-arrow", "tray"] - }, - - "custom/tray-arrow": { - "format": "", - "tooltip": false - }, - "network": { "format-wifi": " {essid}", "format-ethernet": "󰈀", diff --git a/waybar/mouse-battery.sh b/waybar/mouse-battery.sh deleted file mode 100755 index 44dc86e..0000000 --- a/waybar/mouse-battery.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Generic mouse battery script for Waybar - -MOUSE_BATTERY=$(upower -e | grep -i mouse | head -n1) - -if [ -n "$MOUSE_BATTERY" ]; then - upower -i "$MOUSE_BATTERY" | awk '/percentage:/ { print $2 }' -else - echo "N/A" -fi diff --git a/waybar/style.css b/waybar/style.css index 6648601..17b8d78 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -56,13 +56,3 @@ window#waybar { #temperature.critical { color: @tn-red; } - -#custom-tray-arrow { - padding: 0 12px; - color: @tn-fg-muted; - transition: color 200ms ease; -} - -#group-tray-drawer.expanded #custom-tray-arrow { - color: @tn-fg; -}