sway: remove audio workaround for idle inhibit

This commit is contained in:
teutat3s 2024-10-18 20:38:23 +02:00
parent ac1dc3d3dc
commit 4f6488c7e4
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 4 additions and 72 deletions

View file

@ -375,8 +375,7 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"triton-vmtools": "triton-vmtools", "triton-vmtools": "triton-vmtools",
"tritonshell": "tritonshell", "tritonshell": "tritonshell",
"unstable": "unstable", "unstable": "unstable"
"wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit"
} }
}, },
"systems": { "systems": {
@ -460,27 +459,6 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"wayland-pipewire-idle-inhibit",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704649711,
"narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"triton-vmtools": { "triton-vmtools": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -561,30 +539,6 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"wayland-pipewire-idle-inhibit": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1724040047,
"narHash": "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg=",
"owner": "rafaelrc7",
"repo": "wayland-pipewire-idle-inhibit",
"rev": "ab6c30cdf1cfbabd65e1a5a30f0dc94d1114bb45",
"type": "github"
},
"original": {
"owner": "rafaelrc7",
"repo": "wayland-pipewire-idle-inhibit",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -50,10 +50,6 @@
tritonshell.url = "git+https://git.pub.solar/teutat3s/tritonshell?ref=main"; tritonshell.url = "git+https://git.pub.solar/teutat3s/tritonshell?ref=main";
tritonshell.inputs.nixpkgs.follows = "nixpkgs"; tritonshell.inputs.nixpkgs.follows = "nixpkgs";
wayland-pipewire-idle-inhibit.url = "github:rafaelrc7/wayland-pipewire-idle-inhibit";
wayland-pipewire-idle-inhibit.inputs.nixpkgs.follows = "nixpkgs";
wayland-pipewire-idle-inhibit.inputs.flake-parts.follows = "flake-parts";
}; };
outputs = outputs =

View file

@ -37,6 +37,9 @@ in
enable = true; enable = true;
config.sway = { config.sway = {
# https://alex.dandrea.io/2024/07/20/fixing-idle-inhibitor-behaviour-in-firefox-with-wayland/ # https://alex.dandrea.io/2024/07/20/fixing-idle-inhibitor-behaviour-in-firefox-with-wayland/
# https://github.com/emersion/xdg-desktop-portal-wlr/pull/315
# https://github.com/flatpak/xdg-desktop-portal-gtk/issues/465
#
# Use xdg-desktop-portal-gtk for every portal interface... # Use xdg-desktop-portal-gtk for every portal interface...
default = "gtk"; default = "gtk";
# ... except for the ScreenCast, Screenshot and Secret # ... except for the ScreenCast, Screenshot and Secret
@ -93,27 +96,6 @@ in
]; ];
home-manager.users."${psCfg.user.name}" = { home-manager.users."${psCfg.user.name}" = {
imports = [ flake.self.inputs.wayland-pipewire-idle-inhibit.homeModules.default ];
services.wayland-pipewire-idle-inhibit = {
enable = true;
package = pkgs.wayland-pipewire-idle-inhibit;
systemdTarget = "sway-session.target";
settings = {
verbosity = "INFO";
media_minimum_duration = 10;
idle_inhibitor = "wayland";
sink_whitelist = [
{ name = "Starship/Matisse HD Audio Controller Analog Stereo"; }
{ name = "Built-in Audio Analog Stereo"; }
{ name = "MAJOR III BLUETOOTH"; }
];
node_blacklist = [
{ name = "spotify"; }
{ app_name = "Music Player Daemon"; }
];
};
};
programs.waybar.enable = true; programs.waybar.enable = true;
#programs.waybar.systemd.enable = true; #programs.waybar.systemd.enable = true;