From 82438392e9e3ebdeae7ed0ff7691bcdc00e13539 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 16 Aug 2024 14:51:56 +0200
Subject: ...

---
 accounts/gkleen@sif/default.nix  | 19 ++++++++++---------
 accounts/gkleen@sif/hyprland.nix |  6 +++---
 user-profiles/utils.nix          |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 3d352537..7c114856 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -320,7 +320,7 @@ in {
               output = "eDP-1";
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "custom/weather" "custom/keymap" "clock" "privacy" "tray" "pulseaudio" "backlight" "battery" "idle_inhibitor" ];
+              modules-right = [ "custom/weather" "custom/keymap" "clock" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" ];
 
               "custom/weather" = {
                 format = "{}";
@@ -411,7 +411,10 @@ in {
               privacy = {
                 icon-spacing = 7;
                 icon-size = iconSize;
-                modules = [ { type = "screenshare"; } { type = "audio-in"; } ];
+                modules = [
+                  { type = "screenshare"; }
+                  # { type = "audio-in"; }
+                ];
               };
               idle_inhibitor = {
                 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -426,13 +429,13 @@ in {
                 on-scroll-up = "lightctl -d up";
                 on-scroll-down = "lightctl -d down";
               };
-              pulseaudio = {
+              wireplumber = {
                 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
                 icon-size = iconSize;
                 tooltip-format = "{volume}% {desc}";
                 format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
-                format-muted = "&#xf075f;";
-                ignored-sinks = ["Easy Effects Sink"];
+                format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
+                # ignored-sinks = ["Easy Effects Sink"];
                 on-scroll-up = "volumectl -d -u up";
                 on-scroll-down = "volumectl -d -u down";
                 on-click = "volumectl -d toggle-mute";
@@ -518,10 +521,8 @@ in {
             #tray {
               margin: 0;
             }
-            #battery, #idle_inhibitor, #backlight, #pulseaudio {
+            #battery, #idle_inhibitor, #backlight, #wireplumber {
               color: @grey;
-            }
-            #battery, #pulseaudio, #backlight, #idle_inhibitor {
               margin: 0 5px 0 2px;
             }
             #battery.discharging {
@@ -721,7 +722,7 @@ in {
 
       home = {
         packages = with pkgs; [
-          fira fira-code powerline-fonts nerdfonts pavucontrol
+          fira fira-code powerline-fonts nerdfonts pwvucontrol
           wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
           pamixer libnotify screen-message wrappedYTMDesktop qt5ct
           playerctl evince thunderbird zoom-us steam steam-run
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index bdcd32a6..f77856f3 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -261,7 +261,7 @@ in {
 
     "$mainMod CTRL, return, togglespecialworkspace, term"
     "$mainMod CTRL, e, togglespecialworkspace, edit"
-    "$mainMod CTRL, a, togglespecialworkspace, pavucontrol"
+    "$mainMod CTRL, a, togglespecialworkspace, pwvucontrol"
     "$mainMod CTRL, o, togglespecialworkspace, easyeffects"
     "$mainMod CTRL, b, togglespecialworkspace, blueman"
     "$mainMod CTRL, p, togglespecialworkspace, keepass"
@@ -293,7 +293,7 @@ in {
     "suppressevent maximize fullscreen, class:.*"
 
     # "maximize, class:^(Element|thunderbird)$"
-    "workspace special:pavucontrol, class:^org\.pulseaudio\.pavucontrol$"
+    "workspace special:pwvucontrol, class:^com\.saivert\.pwvucontrol$"
     "workspace special:easyeffects, class:^com\.github\.wwmm\.easyeffects$"
     "workspace special:blueman, class:^\.blueman-manager-wrapped$"
     "workspace special:keepass silent, class:^org\.keepassxc\.KeePassXC$, title:^(?!Unlock Database.*)(?!.*Access Request)"
@@ -320,7 +320,7 @@ in {
 
     "special:term, on-created-empty:kitty"
     "special:edit, on-created-empty:emacsclient -c"
-    "special:pavucontrol, on-created-empty:pavucontrol"
+    "special:pwvucontrol, on-created-empty:pwvucontrol"
     "special:easyeffects, on-created-empty:easyeffects"
     "special:blueman, on-created-empty:blueman-manager"
     "special:keepass, on-created-empty:keepassxc"
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index 5990c67f..13eb6033 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -68,6 +68,7 @@ in {
       aspellDicts.de aspellDicts.en borgbackup man-pages rsync socat
       inetutils yq cached-nix-shell persistent-nix-shell rage
       smartmontools hdparm nix-output-monitor wrappedLess dscp
+      iputils
     ];
   };
 }
-- 
cgit v1.2.3