switch from pavucontrol to pwvucontrol, update and switch to rmenu

common/sound.nix

@@ -16,7 +16,8 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
-      pavucontrol
+      (callPackage ../custom/pwvucontrol/package.nix {})
+      # pwvucontrol
       playerctl
       pulseaudio
     ];

custom/pwvucontrol/package.nix

@@ -0,0 +1,84 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchFromGitLab
+, cargo
+, desktop-file-utils
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, wrapGAppsHook4
+, cairo
+, gdk-pixbuf
+, glib
+, gtk4
+, libadwaita
+, pango
+, pipewire
+, wireplumber
+}:
+
+let
+  wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
+    version = "0.4.17";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "pipewire";
+      repo = "wireplumber";
+      rev = version;
+      hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
+    };
+  });
+in
+stdenv.mkDerivation rec {
+  pname = "pwvucontrol";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "saivert";
+    repo = "pwvucontrol";
+    rev = version;
+    hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ=";
+    };
+  };
+
+  nativeBuildInputs = [
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    pango
+    pipewire
+    wireplumber_0_4
+  ];
+
+  meta = with lib; {
+    description = "Pipewire Volume Control";
+    homepage = "https://github.com/saivert/pwvucontrol";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "pwvucontrol";
+    platforms = platforms.linux;
+  };
+}

flake.lock

@@ -523,17 +523,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1711745148,
+        "lastModified": 1711942514,
-        "narHash": "sha256-TS9gV8E4Icpsrb25fUUH8rzQ+X0BIUpbAu/Y5r/TpZI=",
+        "narHash": "sha256-bml15AL/xdMQnlB8d812ufoN049Pm96B9tmcLoyDhW0=",
-        "ref": "7e2302eb64e4bc91e0a92019684dab54990361ad",
+        "owner": "imgurbot12",
-        "rev": "7e2302eb64e4bc91e0a92019684dab54990361ad",
+        "repo": "rmenu",
-        "revCount": 87,
+        "rev": "aed276b104e4fa67341ea88465f452df4c886d6d",
-        "type": "git",
+        "type": "github"
-        "url": "file:///home/grimmauld/rmenu"
       },
       "original": {
-        "type": "git",
+        "owner": "imgurbot12",
-        "url": "file:///home/grimmauld/rmenu"
+        "repo": "rmenu",
+        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -22,7 +22,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     rmenu = {
-      url = "git+file:///home/grimmauld/rmenu";
+      # url = "git+file:///home/grimmauld/rmenu";
+      url = "github:imgurbot12/rmenu";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

sway/bar/config

@@ -106,7 +106,7 @@
             "car": "",
             "default": ["", "", ""]
         },
-        "on-click": "pavucontrol"
+        "on-click": "pwvucontrol"
     },
     "custom/media": {
         "return-type": "json",

sway/sway-conf.nix

@@ -23,7 +23,7 @@ in {
         up = "k";
         right = "l";
         term = "alacritty";
-        menu = "dmenu_path | dmenu | xargs swaymsg exec --";
+        menu = "rmenu -r drun | xargs swaymsg exec --";
 
         primecol = "#8800FF";
         accentcol = "#5700a0";
@@ -161,6 +161,7 @@ input * {
 }
 
 for_window [app_id="swaymux"] floating enable
+for_window [app_id="rmenu"] floating enable
 
 mode "resize" {
     # left will shrink the containers width