switch from pavucontrol to pwvucontrol, update and switch to rmenu

This commit is contained in:
LordGrimmauld 2024-04-01 11:32:57 +02:00
parent 0a6b8812e2
commit 2faf464eda
7 changed files with 1340 additions and 13 deletions

View File

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

1240
custom/pwvucontrol/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -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;
};
}

View File

@ -523,17 +523,17 @@
] ]
}, },
"locked": { "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": { "original": {
"type": "git", "owner": "imgurbot12",
"url": "file:///home/grimmauld/rmenu" "repo": "rmenu",
"type": "github"
} }
}, },
"root": { "root": {

View File

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

View File

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

View File

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