refactor(waybar): simplify registry consumption

configs/nixos/modules/desktop/session/hyprland/default.nix

@@ -233,6 +233,7 @@
       position = "left";
       order = 10;
       settings = {
+        on-click = "activate";
         format = "{id} {windows}";
         format-window-separator = " ";
         window-rewrite-default = util.glyph "f2d0";

configs/nixos/modules/desktop/utilities/audio.nix

@@ -6,33 +6,37 @@
   ...
 }:
 # PipeWire as the desktop audio server.
-let
-  mediaKey = keys: command: {
-    inherit keys;
-    locked = true;
-    action = {
-      kind = "exec";
-      command = "${lib.getExe pkgs.playerctl} ${command}";
-    };
-  };
-in
 {
   options.modules.desktop.utilities.audio.enable = lib.mkEnableOption "the PipeWire audio server";
 
   config = lib.mkIf config.modules.desktop.utilities.audio.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;
-    };
-
     registry.keybind.${config.networking.hostName} = {
-      media-play = mediaKey "XF86AudioPlay" "play-pause";
+      media-play = {
-      media-next = mediaKey "XF86AudioNext" "next";
+        keys = "XF86AudioPlay";
-      media-previous = mediaKey "XF86AudioPrev" "previous";
+        locked = true;
+        action = {
+          kind = "exec";
+          command = "${lib.getExe pkgs.playerctl} play-pause";
+        };
+      };
+
+      media-next = {
+        keys = "XF86AudioNext";
+        locked = true;
+        action = {
+          kind = "exec";
+          command = "${lib.getExe pkgs.playerctl} next";
+        };
+      };
+
+      media-previous = {
+        keys = "XF86AudioPrev";
+        locked = true;
+        action = {
+          kind = "exec";
+          command = "${lib.getExe pkgs.playerctl} previous";
+        };
+      };
     };
 
     registry.waybar.${config.networking.hostName} = {
@@ -62,5 +66,14 @@ in
         };
       };
     };
+
+    # Realtime scheduling for the audio threads, so playback survives load.
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+    };
   };
 }

configs/nixos/modules/desktop/utilities/clipboard.nix

@@ -6,15 +6,21 @@
 }:
 # Clipboard history: cliphist records every copy, picked back through rofi.
 let
+  user = config.user.name;
+
+  cliphist = "${pkgs.cliphist}/bin/cliphist";
+  rofi = "${pkgs.rofi}/bin/rofi";
+  wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
+
   # The picker reuses the themed rofi, so history looks like every other menu
   # the launcher drives.
   # decode is needed because list emits id-prefixed lines rather than the copied
   # bytes, so the chosen id has to be resolved back before it can be re-copied.
   picker = pkgs.writeShellScript "clipboard-picker" ''
-    ${lib.getExe pkgs.cliphist} list \
+    ${cliphist} list \
-      | ${lib.getExe pkgs.rofi} -dmenu -i -p Clipboard \
+      | ${rofi} -dmenu -i -p Clipboard \
-      | ${lib.getExe pkgs.cliphist} decode \
+      | ${cliphist} decode \
-      | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}
+      | ${wl-copy}
   '';
 in
 {
@@ -22,7 +28,15 @@ in
     lib.mkEnableOption "cliphist clipboard history";
 
   config = lib.mkIf config.modules.desktop.utilities.clipboard.enable {
-    home-manager.users.${config.user.name} = {
+    registry.keybind.${config.networking.hostName}.clipboard-history = {
+      keys = "SUPER + SHIFT + V";
+      action = {
+        kind = "exec";
+        command = "${picker}";
+      };
+    };
+
+    home-manager.users.${user} = {
       # wl-copy and wl-paste on PATH, so the shell can pipe into and out of the
       # clipboard.
       # The watchers and picker above reach wl-clipboard by store path, so this
@@ -33,13 +47,5 @@ in
       # session so uwsm starts and stops them with it.
       services.cliphist.enable = true;
     };
-
-    registry.keybind.${config.networking.hostName}.clipboard-history = {
-      keys = "SUPER + SHIFT + V";
-      action = {
-        kind = "exec";
-        command = "${picker}";
-      };
-    };
   };
 }