colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nwg-panel: migrate the mediaPrevNext patch to something suitable for upstream

Browse Source
This commit is contained in:
Colin 2024-06-19 21:04:15 +00:00
parent 2a592a4a15
commit 9e92069ba3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/common/programs/nwg-panel/config.nix
View File

@ -11,6 +11,7 @@
locker, locker,
modulesRight, modulesRight,
playerctlChars, playerctlChars,
mediaPrevNext,
windowIcon, windowIcon,
windowTitle, windowTitle,
workspaceHideEmpty, workspaceHideEmpty,
@ -127,6 +128,9 @@
label-css-name = "playerctl-label"; label-css-name = "playerctl-label";
scroll = false; scroll = false;
show-cover = false; #< don't show the little music-note icon show-cover = false; #< don't show the little music-note icon
show-previous = mediaPrevNext;
show-next = mediaPrevNext;
show-name = mediaPrevNext;
}; };
sway-workspaces = { sway-workspaces = {
angle = 0.0; angle = 0.0;

13
hosts/common/programs/nwg-panel/default.nix
View File

@ -75,8 +75,15 @@ in
# XXX(2024/06/13): wlr-randr does not cross compile # XXX(2024/06/13): wlr-randr does not cross compile
wlr-randr = null; #< only used if not on sway/hyprland; or if using dwl wlr-randr = null; #< only used if not on sway/hyprland; or if using dwl
}).overrideAttrs (base: { }).overrideAttrs (base: {
patches = (base.patches or []) ++ lib.optionals (!cfg.config.mediaPrevNext) [ # patches = (base.patches or []) ++ lib.optionals (!cfg.config.mediaPrevNext) [
./playerctl-no-prev-next.diff # ./playerctl-no-prev-next.diff
# ];
patches = (base.patches or []) ++ [
(pkgs.fetchpatch {
url = "https://git.uninsane.org/colin/nwg-panel/commit/a714e4100c409feb02c454874d030d192bfb0ae5.patch";
name = "playerctl: add settings to control which elements are displayed";
hash = "sha256-OofS46wAI3EDE3JbYs/Nn+Vkw9TP1mwSFvk+vBERg2s=";
})
]; ];
# - disable the drop-down chevron by the controls. # - disable the drop-down chevron by the controls.
@ -113,7 +120,7 @@ in
}; };
fs.".config/nwg-panel/common-settings.json".symlink.target = ./common-settings.json; fs.".config/nwg-panel/common-settings.json".symlink.target = ./common-settings.json;
fs.".config/nwg-panel/config".symlink.target = pkgs.writers.writeJSON "config" (import ./config.nix { fs.".config/nwg-panel/config".symlink.target = pkgs.writers.writeJSON "config" (import ./config.nix {
inherit (cfg.config) locker height windowIcon windowTitle workspaceHideEmpty workspaceNumbers; inherit (cfg.config) locker height mediaPrevNext windowIcon windowTitle workspaceHideEmpty workspaceNumbers;
# component order matters, mostly for the drop-down. # component order matters, mostly for the drop-down.
# default for most tools (e.g. swaync) is brightness control above volume. # default for most tools (e.g. swaync) is brightness control above volume.
controlsSettingsComponents = controlsSettingsComponents =