wayland-desktop/waybar: Add WirePlumber module NixOS uses PipeWire.

Changes

2 changed files (+28/-3)

• modules/hm/profiles/linux-desktop.nix
  • @@ -74,5 +74,8 @@
    { regexp = "Vim"; } { regexp = "Qt\\s.*[Uu]tility"; } ]; + + # redarch uses PulseAudio. + wayland-desktop.waybar.soundSystem = "pulseaudio"; }; }
• modules/hm/wayland-desktop/waybar.nix
  • @@ -16,16 +16,31 @@
    # > Highly customizable Wayland bar for Sway and Wlroots based compositors # https://github.com/alexays/waybar - { config, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: let waybar-text = pkgs.callPackage ../../../programs/waybar-text { }; light = config.palette.catppuccin.light-palette; dark = config.palette.catppuccin.dark-palette; + + cfg = config.wayland-desktop.waybar; in { imports = [ ../palette/catppuccin.nix ]; + options.wayland-desktop.waybar.soundSystem = lib.mkOption { + type = lib.types.enum [ + "pulseaudio" + "pipewire" + ]; + default = "pipewire"; + }; + config = { programs.waybar = { enable = true;
  • @@ -38,7 +53,7 @@ in
    modules-left = [ "custom/todo" ]; modules-right = [ "clock" - "pulseaudio" + (if (cfg.soundSystem == "pulseaudio") then "pulseaudio" else "wireplumber") "tray" ];
  • @@ -49,13 +64,20 @@ in
    format = "{:%Y-%m-%d %H:%M}"; }; - pulseaudio = { + pulseaudio = lib.mkIf (cfg.soundSystem == "pulseaudio") { format = "{icon} {volume}% / {format_source}"; format-muted = "muted {format_source}"; on-click = "pavucontrol"; }; + wireplumber = lib.mkIf (cfg.soundSystem == "pipewire") { + format = "{icon} {volume}% / {format_source}"; + format-muted = "muted {format_source}"; + + on-click = lib.getExe pkgs.pwvucontrol; + }; + "custom/todo" = { exec = "${waybar-text}/bin/,waybar-text --trim-md-list ${config.xdg.dataHome}/todo.md"; restart-interval = 10;