1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-24 10:49:48 +01:00

polybar: fix restart trigger

The old trigger would actually never cause a restart since the path
doesn't change. With this change the trigger is now using the actual
configuration path in the Nix store, which depends on the content.
This commit is contained in:
Robert Helgesson 2022-12-04 12:12:32 +01:00
parent 9fb1bb9794
commit 65700a4fd1
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 16 additions and 12 deletions

View file

@ -55,11 +55,17 @@ let
in "${key}=${value'}"; in "${key}=${value'}";
}; };
configFile = pkgs.writeText "polybar.conf" '' configFile = let
${toPolybarIni cfg.config} isDeclarativeConfig = cfg.settings != opt.settings.default || cfg.config
${toPolybarIni (mapAttrs convertPolybarSection cfg.settings)} != opt.config.default || cfg.extraConfig != opt.extraConfig.default;
${cfg.extraConfig} in if isDeclarativeConfig then
''; pkgs.writeText "polybar.conf" ''
${toPolybarIni cfg.config}
${toPolybarIni (mapAttrs convertPolybarSection cfg.settings)}
${cfg.extraConfig}
''
else
null;
in { in {
options = { options = {
@ -202,16 +208,14 @@ in {
meta.maintainers = with maintainers; [ h7x4 ]; meta.maintainers = with maintainers; [ h7x4 ];
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xdg.configFile."polybar/config.ini" = let xdg.configFile."polybar/config.ini" =
isDeclarativeConfig = cfg.settings != opt.settings.default || cfg.config mkIf (configFile != null) { source = configFile; };
!= opt.config.default || cfg.extraConfig != opt.extraConfig.default;
in mkIf isDeclarativeConfig { source = configFile; };
systemd.user.services.polybar = { systemd.user.services.polybar = {
Unit = { Unit = {
Description = "Polybar status bar"; Description = "Polybar status bar";
PartOf = [ "tray.target" ]; PartOf = [ "tray.target" ];
X-Restart-Triggers = [ "${config.xdg.configHome}/polybar/config.ini" ]; X-Restart-Triggers = mkIf (configFile != null) "${configFile}";
}; };
Service = { Service = {

View file

@ -47,7 +47,7 @@
serviceFile=home-files/.config/systemd/user/polybar.service serviceFile=home-files/.config/systemd/user/polybar.service
assertFileExists $serviceFile assertFileExists $serviceFile
assertFileRegex $serviceFile 'X-Restart-Triggers=.*/.config/polybar/config.ini' assertFileRegex $serviceFile 'X-Restart-Triggers=/nix/store/.*-polybar.conf$'
assertFileRegex $serviceFile 'ExecStart=.*/bin/polybar-start' assertFileRegex $serviceFile 'ExecStart=.*/bin/polybar-start'
assertFileExists home-files/.config/polybar/config.ini assertFileExists home-files/.config/polybar/config.ini

View file

@ -12,7 +12,7 @@
serviceFile=home-files/.config/systemd/user/polybar.service serviceFile=home-files/.config/systemd/user/polybar.service
assertFileExists $serviceFile assertFileExists $serviceFile
assertFileRegex $serviceFile 'X-Restart-Triggers=.*/.config/polybar/config.ini' assertFileNotRegex $serviceFile 'X-Restart-Triggers=/nix/store/.*-polybar.conf$'
assertFileRegex $serviceFile 'ExecStart=.*/bin/polybar-start' assertFileRegex $serviceFile 'ExecStart=.*/bin/polybar-start'
assertPathNotExists home-files/.config/polybar/config.ini assertPathNotExists home-files/.config/polybar/config.ini