fusuma: add missing dependencies
This commit is contained in:
parent
587719494e
commit
bd9141ea97
|
@ -96,10 +96,11 @@ in {
|
|||
|
||||
extraPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = with pkgs; [ coreutils ];
|
||||
defaultText = literalExpression "pkgs.coreutils";
|
||||
default = with pkgs; [ xdotool coreutils xorg.xprop ];
|
||||
defaultText =
|
||||
literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xorg.xprop";
|
||||
example = literalExpression ''
|
||||
with pkgs; [ coreutils xdotool ];
|
||||
with pkgs; [ xdotool coreutils xorg.xprop ];
|
||||
'';
|
||||
description = ''
|
||||
Extra packages needs to bring to the scope of fusuma service.
|
||||
|
@ -113,7 +114,7 @@ in {
|
|||
lib.platforms.linux)
|
||||
];
|
||||
|
||||
xdg.configFile."fusuma/config.yaml".source = configYaml;
|
||||
xdg.configFile."fusuma/config.yml".source = configYaml;
|
||||
|
||||
systemd.user.services.fusuma = {
|
||||
Unit = {
|
||||
|
@ -124,8 +125,7 @@ in {
|
|||
|
||||
Service = {
|
||||
Environment = with pkgs; "PATH=${makeBinPath cfg.extraPackages}";
|
||||
ExecStart =
|
||||
"${cfg.package}/bin/fusuma -c ${config.xdg.configHome}/fusuma/config.yaml";
|
||||
ExecStart = "${cfg.package}/bin/fusuma";
|
||||
};
|
||||
|
||||
Install = { WantedBy = [ "graphical-session.target" ]; };
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
WantedBy=graphical-session.target
|
||||
|
||||
[Service]
|
||||
Environment=PATH=@coreutils@/bin:@xdotool@/bin
|
||||
ExecStart=@fusuma@/bin/fusuma -c /home/hm-user/.config/fusuma/config.yaml
|
||||
Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
|
||||
ExecStart=@fusuma@/bin/fusuma
|
||||
|
||||
[Unit]
|
||||
After=graphical-session-pre.target
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
extraPackages = [
|
||||
(config.lib.test.mkStubPackage { outPath = "@coreutils@"; })
|
||||
(config.lib.test.mkStubPackage { outPath = "@xdotool@"; })
|
||||
(config.lib.test.mkStubPackage { outPath = "@xorg.xprop@"; })
|
||||
];
|
||||
settings = { };
|
||||
};
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
nmt.script = ''
|
||||
assertFileContent \
|
||||
home-files/.config/fusuma/config.yaml \
|
||||
home-files/.config/fusuma/config.yml \
|
||||
${./expected-settings.yaml}
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue