.claude/tasks/0023-waybar-status-bar.md

@@ -13,7 +13,28 @@ The do-not-disturb toggle and media controls live in the bar rather than in a se
 
 ## Acceptance criteria
 
-- [ ] A Waybar module exists in the desktop group and is enabled by the aggregator.
-- [ ] The bar shows workspaces with per-application icons, a clock, battery, network, audio, MPRIS media controls, and a do-not-disturb toggle.
-- [ ] No overview/exposé plugin is used.
-- [ ] neogaia builds green under `nix flake check`.
+- [x] A Waybar module exists in the desktop group and is enabled by the aggregator.
+- [x] The bar shows workspaces with per-application icons, a clock, battery, network, audio, MPRIS media controls, and a do-not-disturb toggle.
+- [x] No overview/exposé plugin is used.
+- [x] neogaia builds green under `nix flake check`.
+
+## Implementation Notes
+
+- **Audio server added beyond the plan.**
+  The task asked only for the bar's audio *widget*, but nothing in the epic provisions an audio server, and a `wireplumber` widget over a machine with no running sink is inert.
+  A small `modules/desktop/audio.nix` therefore enables PipeWire (with the ALSA and PulseAudio compatibility shims and rtkit) under its own `modules.desktop.audio.enable`, wired into the aggregator at default priority like every other piece.
+  It is a distinct concern that could equally live in its own task, so it is flagged here and in the PR for the operator to split out or keep.
+
+- **Do-not-disturb depends on mako, which lands later.**
+  The `custom/dnd` widget shells out to `makoctl`, whose daemon arrives with the notifications task (0025).
+  The status script pins mako's store path and degrades to "notifications on" whenever no daemon answers, so the widget is inert rather than broken before 0025 and reflects real state the moment mako runs.
+
+- **Glyphs decoded, not pasted.**
+  Nerd-font module icons are Private-Use-Area codepoints that do not survive an editor paste, so a `g = code: builtins.fromJSON ''"\u${code}"''` helper decodes each one to real bytes.
+  `nerd-fonts.symbols-only` is installed system-wide as the pango fallback for those codepoints, since Stylix's monospace font does not carry them.
+
+- **Bar launch.**
+  The bar runs as a home-manager systemd user service bound to `graphical-session.target`, which uwsm activates, so it comes up with the session without a compositor `exec-once`.
+
+- **Runtime checks deferred to the machine.**
+  `nix flake check` proves the config evaluates and the host builds, but the rendered bar, the MPRIS widget, and the audio widget can only be exercised in a live Wayland session on neogaia.

CLAUDE.md

@@ -28,6 +28,9 @@ The domain model (Host, Module, Skeleton, Auto-loader, Enable convention, overla
 - Commit messages follow Conventional Commits, specified in `docs/conventional-commits.md`.
   Scope is the module or host the change belongs to (`fish`, `nvim`, `neogaia`), omitted for repo-wide changes.
   Keep messages free of Gitea-specific references: this repository is mirrored to GitHub, where issue and pull-request numbers resolve to unrelated things.
+- When a graphical application is added, give it a `window-rewrite` icon mapping in `modules/desktop/waybar.nix`.
+  Without one its windows fall back to the generic default glyph on the workspace indicator instead of showing a recognisable per-application icon.
+  Match on the window class, which `hyprctl clients -j | jq -r '.[].class' | sort -u` lists for the running session.
 
 ## Gotchas
 

modules/desktop/audio.nix

@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+# PipeWire as the desktop audio server.
+let
+  cfg = config.modules.desktop.audio;
+in
+{
+  options.modules.desktop.audio.enable = lib.mkEnableOption "the PipeWire audio server";
+
+  config = lib.mkIf cfg.enable {
+    # Realtime scheduling for the audio threads, so playback survives load.
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+    };
+  };
+}

modules/desktop/desktop.nix

@@ -13,5 +13,7 @@ in
     modules.desktop.login.enable = lib.mkDefault true;
     modules.desktop.terminal.enable = lib.mkDefault true;
     modules.desktop.theming.enable = lib.mkDefault true;
+    modules.desktop.waybar.enable = lib.mkDefault true;
+    modules.desktop.audio.enable = lib.mkDefault true;
   };
 }

modules/desktop/hyprland/hyprland.nix

@@ -137,6 +137,20 @@ in
           "$mod CTRL, Q, forcekillactive,"
         ]
         ++ workspaceBinds;
+
+        # Volume keys repeat while held, capped at 150 percent.
+        binde = [
+          ", XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
+          ", XF86AudioLowerVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ];
+
+        # Mute and media transport still fire while the session is locked.
+        bindl = [
+          ", XF86AudioMute, exec, ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+          ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+          ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
+          ", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
+        ];
       };
     };
   };

modules/desktop/waybar.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# Waybar: a top status bar reading system state at a glance.
+let
+  cfg = config.modules.desktop.waybar;
+  user = config.user.name;
+
+  # A Nerd Font Private-Use-Area codepoint as a literal character, decoded
+  # through JSON so the glyph survives as bytes rather than an editor paste.
+  g = code: builtins.fromJSON ''"\u${code}"'';
+
+  # Renders and toggles mako's do-not-disturb mode.
+  # With no mako daemon answering, the status reads "notifications on", keeping
+  # the widget inert rather than broken.
+  dndStatus = pkgs.writeShellScript "waybar-dnd-status" ''
+    if ${pkgs.mako}/bin/makoctl mode 2>/dev/null | ${pkgs.gnugrep}/bin/grep -qx dnd; then
+      printf '{"text":"${g "f1f6"}","tooltip":"Do not disturb: on","class":"dnd"}\n'
+    else
+      printf '{"text":"${g "f0f3"}","tooltip":"Notifications on","class":"active"}\n'
+    fi
+  '';
+
+  dndToggle = pkgs.writeShellScript "waybar-dnd-toggle" ''
+    ${pkgs.mako}/bin/makoctl mode -t dnd >/dev/null 2>&1
+    ${pkgs.procps}/bin/pkill -RTMIN+8 waybar
+  '';
+in
+{
+  options.modules.desktop.waybar.enable = lib.mkEnableOption "the Waybar status bar";
+
+  config = lib.mkIf cfg.enable {
+    # A symbols font backs the module glyphs, so pango falls back to it for the
+    # codepoints Stylix's monospace font does not carry.
+    fonts.packages = [ pkgs.nerd-fonts.symbols-only ];
+
+    home-manager.users.${user}.programs.waybar = {
+      enable = true;
+
+      # A user service bound to graphical-session.target, which uwsm activates,
+      # so the bar comes up with the session and no compositor exec-once.
+      systemd.enable = true;
+
+      settings.mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+
+        modules-left = [ "hyprland/workspaces" ];
+        modules-center = [ "clock" ];
+        modules-right = [
+          "mpris"
+          "wireplumber"
+          "network"
+          "battery"
+          "custom/dnd"
+        ];
+
+        # Per-application icons for the windows on each workspace, mapped from
+        # window class with a neutral glyph for anything unlisted.
+        "hyprland/workspaces" = {
+          on-click = "activate";
+          format = "{id} {windows}";
+          format-window-separator = " ";
+          window-rewrite-default = g "f2d0";
+          window-rewrite = {
+            "class<Alacritty>" = g "f120";
+            "class<.*[Ff]irefox.*>" = g "f269";
+            "class<chromium.*>" = g "f268";
+            "class<[Cc]ode>" = g "f121";
+          };
+        };
+
+        clock = {
+          format = "{:%a %d %b  %H:%M}";
+          tooltip-format = "<tt>{calendar}</tt>";
+          calendar = {
+            mode = "month";
+            # Underline the current day so it stands out in the grid.
+            format.today = "<b><u>{}</u></b>";
+          };
+        };
+
+        mpris = {
+          format = "${g "f001"} {title}";
+          format-paused = "${g "f04c"} {title}";
+          max-length = 40;
+          on-click = "play-pause";
+          on-scroll-up = "next";
+          on-scroll-down = "previous";
+        };
+
+        wireplumber = {
+          format = "{icon} {volume}%";
+          format-muted = "${g "f026"} muted";
+          format-icons = [
+            (g "f026")
+            (g "f027")
+            (g "f028")
+          ];
+          on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        };
+
+        network = {
+          format-wifi = "${g "f1eb"} {essid}";
+          format-ethernet = "${g "f796"} {ifname}";
+          format-disconnected = "${g "f127"} off";
+          tooltip-format = "{ipaddr} via {gwaddr}";
+        };
+
+        battery = {
+          format = "{icon} {capacity}%";
+          format-charging = "${g "f0e7"} {capacity}%";
+          format-icons = [
+            (g "f244")
+            (g "f243")
+            (g "f242")
+            (g "f241")
+            (g "f240")
+          ];
+          states = {
+            warning = 20;
+            critical = 10;
+          };
+        };
+
+        "custom/dnd" = {
+          return-type = "json";
+          exec = "${dndStatus}";
+          on-click = "${dndToggle}";
+          interval = "once";
+          signal = 8;
+        };
+      };
+    };
+  };
+}