Desktop: Per-VM audio control, ghafpkgs bump

- ghafpkgs flake bump - add per-vm audio control in audio control app - remove audio control app from app launcher - change audio control app systray icon Signed-off-by: Kajus Naujokaitis <[email protected]>
brianmcgillion · Feb 13, 2025 · 479b753 · 479b753
1 parent 123a9ba
commit 479b753
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/desktop/graphics/labwc.config.nix b/modules/desktop/graphics/labwc.config.nix
@@ -514,6 +514,22 @@ in
         partOf = [ "ewwbar.service" ];
       };
 
+      audio-control = {
+        enable = true;
+        description = "Audio Control application";
+
+        serviceConfig = {
+          Type = "simple";
+          Restart = "always";
+          RestartSec = "5";
+          ExecStart = "${pkgs.ghaf-audio-control}/bin/GhafAudioControlStandalone --pulseaudio_server=audio-vm:${toString config.ghaf.services.audio.pulseaudioTcpControlPort} --deamon_mode=true --indicator_icon_name=audio-subwoofer";
+        };
+
+        partOf = [ "ewwbar.service" ];
+        after = [ "ewwbar.service" ];
+        wantedBy = [ "ewwbar.service" ];
+      };
+
       # We use existing blueman services and create overrides for both
       blueman-applet = {
         enable = true;

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -168,21 +168,6 @@ let
           systemd = {
             packages = [ pkgs.blueman ];
 
-            user.services.audio-control = {
-              enable = true;
-              description = "Audio Control application";
-
-              serviceConfig = {
-                Type = "simple";
-                Restart = "always";
-                RestartSec = "5";
-                ExecStart = "${pkgs.ghaf-audio-control}/bin/GhafAudioControlStandalone --pulseaudio_server=audio-vm:${toString config.ghaf.services.audio.pulseaudioTcpControlPort} --deamon_mode=true --indicator_icon_name=preferences-sound";
-              };
-
-              partOf = [ "ghaf-session.target" ];
-              wantedBy = [ "ghaf-session.target" ];
-            };
-
             services."waypipe-ssh-keygen" =
               let
                 uid = "${toString config.ghaf.users.loginUser.uid}";

diff --git a/modules/reference/desktop/applications.nix b/modules/reference/desktop/applications.nix
@@ -8,7 +8,6 @@
 }:
 let
   cfg = config.ghaf.reference.desktop.applications;
-  inherit (config.ghaf.services.audio) pulseaudioTcpControlPort;
   inherit (lib) mkIf mkEnableOption;
 in
 {
@@ -46,13 +45,6 @@ in
           command = "${pkgs.bt-launcher}/bin/bt-launcher";
         }
 
-        {
-          name = "Audio Control";
-          description = "System Audio Control";
-          icon = "preferences-sound";
-          command = "${pkgs.ghaf-audio-control}/bin/GhafAudioControlStandalone --pulseaudio_server=audio-vm:${toString pulseaudioTcpControlPort} --indicator_icon_name=preferences-sound";
-        }
-
         {
           name = "Falcon AI";
           description = "Your local large language model, developed by TII";