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

picom: use getExe instead of hardcoded binary

Browse source
This commit is contained in:
Philipp Mildenberger 2023-11-21 08:55:46 +01:00 committed by GitHub
parent 9482610ac1
commit 1aabb0a31b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/services/picom.nix
View file

@ -5,7 +5,7 @@ let
inherit (lib) inherit (lib)
boolToString concatMapStringsSep concatStringsSep escape literalExpression boolToString concatMapStringsSep concatStringsSep escape literalExpression
mapAttrsToList mkEnableOption mkRenamedOptionModule mkRemovedOptionModule mapAttrsToList mkEnableOption mkRenamedOptionModule mkRemovedOptionModule
mkDefault mkIf mkOption optional types warn; mkDefault mkIf mkOption optional types warn getExe;
cfg = config.services.picom; cfg = config.services.picom;
opt = options.services.picom; opt = options.services.picom;
@ -318,7 +318,7 @@ in {
Service = { Service = {
ExecStart = concatStringsSep " " ([ ExecStart = concatStringsSep " " ([
"${cfg.package}/bin/picom" "${getExe cfg.package}"
"--config ${config.xdg.configFile."picom/picom.conf".source}" "--config ${config.xdg.configFile."picom/picom.conf".source}"
] ++ cfg.extraArgs); ] ++ cfg.extraArgs);
Restart = "always"; Restart = "always";

2
tests/modules/services/picom/picom-basic-configuration-expected.service
View file

@ -2,7 +2,7 @@
WantedBy=graphical-session.target WantedBy=graphical-session.target
[Service] [Service]
ExecStart=@picom@/bin/picom --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends ExecStart=@picom@/bin/dummy --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends
Restart=always Restart=always
RestartSec=3 RestartSec=3