audio: fix dropped pipewire messages

- use pulseaudio controls for keyboard shortcuts
- fixes an issue where audio keyboard shortcuts might be ignored
- reduce amount of givc/pipewire logs in gui and audio vm

Signed-off-by: Kajus Naujokaitis <[email protected]>

Author: kajusnau

modules/common/services/audio/server.nix

@@ -98,13 +98,13 @@ in
                     # but keep it for compatibility with CLI tools
                     {
                       "address" = "tcp:${toString cfg.server.pulseaudioTcpPort}"; # address
-                      "max-clients" = 8; # maximum number of clients
+                      "max-clients" = 32; # maximum number of clients
                       "listen-backlog" = 32; # backlog in the server listen queue
                       "client.access" = "restricted"; # permissions for clients (restricted|unrestricted)
                     }
                     {
                       "address" = "tcp:${toString cfg.server.pulseaudioTcpControlPort}";
-                      "max-clients" = 8;
+                      "max-clients" = 32;
                       "listen-backlog" = 32;
                       "client.access" = "unrestricted";
                     }

modules/desktop/graphics/cosmic/config/cosmic-config.nix

@@ -98,58 +98,56 @@ let
       '') extraShortcuts}
     ''
   );
+
   ghaf-volume = pkgs.writeShellApplication {
     name = "ghaf-volume";
 
     runtimeInputs = with pkgs; [
-      wireplumber
       pulseaudio
+      pamixer
     ];
 
     text = ''
-      export PIPEWIRE_RUNTIME_DIR=/tmp
-
       AMP_FILE="$HOME/.config/cosmic/com.system76.CosmicAudio/v1/amplification_sink"
-      # Enable amplification by default, following COSMIC upstream behavior
-      AMP_ENABLED="true"
-      LIMIT=1.5
       VOLUME_CHANGE_SOUND="/run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga"
 
-      exit_error() {
-        echo "Usage: ghaf-volume {up|down}"
-        exit 1
-      }
-
-      DIR=''${1:-}
-
-      [ -z "$DIR" ] && exit_error
-
-      if [ -f "$AMP_FILE" ] && [ -s "$AMP_FILE" ]; then
-        VALUE=$(tr -d '[:space:]' < "$AMP_FILE")
-        if [[ "$VALUE" == "true" || "$VALUE" == "false" ]]; then
-          AMP_ENABLED="$VALUE"
-        fi
+      # Enable amplification by default, following COSMIC upstream behavior
+      AMP_ENABLED=true
+      LIMIT=150
+
+      # Fast argument parsing
+      case "$1" in
+        up)   DIR=-i ;;
+        down) DIR=-d ;;
+        *) echo "Usage: ghaf-volume {up|down}" >&2; exit 1 ;;
+      esac
+
+      if [[ -s "$AMP_FILE" ]]; then
+        read -r AMP_ENABLED < "$AMP_FILE" || true
       fi
 
-      [[ "$AMP_ENABLED" == "false" ]] && LIMIT=1.0
+      [[ "$AMP_ENABLED" == "false" ]] && LIMIT=100
 
-      if [[ "$DIR" == "up" ]]; then
-          DIR=+
-      elif [[ "$DIR" == "down" ]]; then
-          DIR=-
+      if [[ "$AMP_ENABLED" != "true" ]]; then
+        LIMIT=100
+        BOOST=""
       else
-          exit_error
+        BOOST="--allow-boost"
       fi
 
-      wpctl set-mute @DEFAULT_AUDIO_SINK@ 0 &
-      wpctl set-volume @DEFAULT_AUDIO_SINK@ "5%$DIR" -l $LIMIT
-      paplay "$VOLUME_CHANGE_SOUND"
+      CUR_VOLUME=$(pamixer --get-volume)
+
+      pamixer --unmute $DIR 5 --set-limit $LIMIT $BOOST
+
+      # Play sound only if volume changed
+      NEW_VOLUME=$(pamixer --get-volume)
+      [[ "$CUR_VOLUME" != "$NEW_VOLUME" ]] && paplay "$VOLUME_CHANGE_SOUND"
     '';
   };
 in
 pkgs.stdenv.mkDerivation {
   pname = "ghaf-cosmic-config";
-  version = "0.2";
+  version = "0.3";
 
   phases = [
     "unpackPhase"

modules/desktop/graphics/cosmic/config/cosmic-config.yaml

@@ -353,9 +353,9 @@ com.system76.CosmicSettings.Shortcuts:
         /// Locks the screen
         LockScreen: "loginctl lock-session",
         /// Mutes the active output device
-        Mute: "PIPEWIRE_RUNTIME_DIR=/tmp wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        Mute: "pactl set-sink-mute @DEFAULT_SINK@ toggle",
         /// Mutes the active microphone
-        MuteMic: "PIPEWIRE_RUNTIME_DIR=/tmp wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
+        MuteMic: "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
         /// Plays and Pauses audio
         PlayPause: "playerctl play-pause",
         /// Goes to the next track

modules/desktop/graphics/cosmic/default.nix

@@ -348,7 +348,6 @@ in
 
             text = ''
               PROCESSES=("cosmic-osd")
-              KILLABLES=("cosmic-osd")
 
               THRESHOLD=80
               INTERVAL=10
@@ -366,7 +365,7 @@ in
                       if (( CPU > THRESHOLD )); then
                           if (( NOW - LAST_KILL >= COOLDOWN )); then
                               echo "$(date) High CPU detected ($PROC: ''${CPU}%), killing processes..."
-                              for KILL_PROC in "''${KILLABLES[@]}"; do
+                              for KILL_PROC in "''${PROCESSES[@]}"; do
                                   pkill -xf "$KILL_PROC" && echo "$(date) Killed $KILL_PROC"
                               done
                               LAST_KILL=$NOW

modules/microvm/sysvms/guivm.nix

@@ -238,11 +238,6 @@ let
                 pkgs.gnome-calculator
                 pkgs.sticky-notes
               ])
-              ++ [
-                pkgs.pamixer
-                pkgs.eww
-                pkgs.wlr-randr
-              ]
               ++ [ pkgs.ctrl-panel ]
               # For GIVC debugging/testing
               ++ lib.optional config.ghaf.profiles.debug.enable pkgs.givc-cli