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

fusuma: add missing dependencies

Browse source
This commit is contained in:
zorrobert 2024-02-23 13:25:32 +01:00 committed by Robert Helgesson
parent 587719494e
commit bd9141ea97
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/services/fusuma.nix
View file

@ -96,10 +96,11 @@ in {
extraPackages = mkOption { extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = with pkgs; [ coreutils ]; default = with pkgs; [ xdotool coreutils xorg.xprop ];
defaultText = literalExpression "pkgs.coreutils"; defaultText =
literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xorg.xprop";
example = literalExpression '' example = literalExpression ''
with pkgs; [ coreutils xdotool ]; with pkgs; [ xdotool coreutils xorg.xprop ];
''; '';
description = '' description = ''
Extra packages needs to bring to the scope of fusuma service. Extra packages needs to bring to the scope of fusuma service.
@ -113,7 +114,7 @@ in {
lib.platforms.linux) lib.platforms.linux)
]; ];
xdg.configFile."fusuma/config.yaml".source = configYaml; xdg.configFile."fusuma/config.yml".source = configYaml;
systemd.user.services.fusuma = { systemd.user.services.fusuma = {
Unit = { Unit = {
@ -124,8 +125,7 @@ in {
Service = { Service = {
Environment = with pkgs; "PATH=${makeBinPath cfg.extraPackages}"; Environment = with pkgs; "PATH=${makeBinPath cfg.extraPackages}";
ExecStart = ExecStart = "${cfg.package}/bin/fusuma";
"${cfg.package}/bin/fusuma -c ${config.xdg.configHome}/fusuma/config.yaml";
}; };
Install = { WantedBy = [ "graphical-session.target" ]; }; Install = { WantedBy = [ "graphical-session.target" ]; };

4
tests/modules/services/fusuma/expected-service.service
View file

@ -2,8 +2,8 @@
WantedBy=graphical-session.target WantedBy=graphical-session.target
[Service] [Service]
Environment=PATH=@coreutils@/bin:@xdotool@/bin Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
ExecStart=@fusuma@/bin/fusuma -c /home/hm-user/.config/fusuma/config.yaml ExecStart=@fusuma@/bin/fusuma
[Unit] [Unit]
After=graphical-session-pre.target After=graphical-session-pre.target

1
tests/modules/services/fusuma/service.nix
View file

@ -7,6 +7,7 @@
extraPackages = [ extraPackages = [
(config.lib.test.mkStubPackage { outPath = "@coreutils@"; }) (config.lib.test.mkStubPackage { outPath = "@coreutils@"; })
(config.lib.test.mkStubPackage { outPath = "@xdotool@"; }) (config.lib.test.mkStubPackage { outPath = "@xdotool@"; })
(config.lib.test.mkStubPackage { outPath = "@xorg.xprop@"; })
]; ];
settings = { }; settings = { };
}; };

2
tests/modules/services/fusuma/settings.nix
View file

@ -18,7 +18,7 @@
nmt.script = '' nmt.script = ''
assertFileContent \ assertFileContent \
home-files/.config/fusuma/config.yaml \ home-files/.config/fusuma/config.yml \
${./expected-settings.yaml} ${./expected-settings.yaml}
''; '';
} }