nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

waybar: allow multiple systemd targets

Browse source
This commit is contained in:
oneorseveralcats 2026-03-26 18:00:30 -04:00 • committed by Austin Horstman
parent 4b1be5c38b
commit accd450fcd
3 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/programs/waybar.nix
View file

@ -168,6 +168,14 @@ in
khaneliman
];
imports = [
(lib.mkChangedOptionModule
[ "programs" "waybar" "systemd" "target" ]
[ "programs" "waybar" "systemd" "targets" ]
(config: lib.toList (lib.getAttrFromPath [ "programs" "waybar" "systemd" "target" ] config))
)
];
options.programs.waybar = with lib.types; {
enable = mkEnableOption "Waybar";
@ -227,15 +235,15 @@ in
'';
};
target = mkOption {
type = str;
default = config.wayland.systemd.target;
defaultText = literalExpression "config.wayland.systemd.target";
example = "sway-session.target";
targets = mkOption {
type = with lib.types; listOf str;
default = [ config.wayland.systemd.target ];
defaultText = literalExpression "[ config.wayland.systemd.target ]";
example = [ "sway-session.target" ];
description = ''
The systemd target that will automatically start the Waybar service.
The systemd targets that will automatically start the Waybar service.
When setting this value to `"sway-session.target"`,
When setting this value to `[ "sway-session.target" ]`,
make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
otherwise the service may never be started.
'';
@ -340,11 +348,8 @@ in
Unit = {
Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
Documentation = "https://github.com/Alexays/Waybar/wiki";
PartOf = [
cfg.systemd.target
"tray.target"
];
After = [ cfg.systemd.target ];
PartOf = [ "tray.target" ] ++ cfg.systemd.targets;
After = cfg.systemd.targets;
ConditionEnvironment = "WAYLAND_DISPLAY";
X-Reload-Triggers =
optional (settings != [ ]) "${config.xdg.configFile."waybar/config".source}"
@ -359,10 +364,7 @@ in
Restart = "on-failure";
};
Install.WantedBy = [
cfg.systemd.target
"tray.target"
];
Install.WantedBy = [ "tray.target" ] ++ cfg.systemd.targets;
};
})
]);

2
tests/modules/programs/waybar/systemd-with-graphical-session-target.nix
View file

@ -8,7 +8,7 @@
package = config.lib.test.mkStubPackage { outPath = "@waybar@"; };
enable = true;
systemd.enable = true;
systemd.target = "sway-session.target";
systemd.targets = [ "sway-session.target" ];
};
nmt.script = ''

4
tests/modules/programs/waybar/systemd-with-graphical-session-target.service
View file

@ -1,6 +1,6 @@
[Install]
WantedBy=sway-session.target
WantedBy=tray.target
WantedBy=sway-session.target
[Service]
ExecReload=/nix/store/00000000000000000000000000000000-coreutils/bin/kill -SIGUSR2 $MAINPID
@ -13,5 +13,5 @@ After=sway-session.target
ConditionEnvironment=WAYLAND_DISPLAY
Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
Documentation=https://github.com/Alexays/Waybar/wiki
PartOf=sway-session.target
PartOf=tray.target
PartOf=sway-session.target