failing: scripts/base needs to be unique

This commit is contained in:
Danilo Reyes 2024-05-11 21:54:31 -06:00
parent 02d600cc73
commit bdfbf790ec
5 changed files with 47 additions and 24 deletions

View File

@ -43,7 +43,10 @@ in {
printing.enable = true; printing.enable = true;
sound.enable = true; sound.enable = true;
}; };
scripts = { tasks.enable = true; }; scripts = {
tasks.enable = true;
run.enable = true;
};
}; };
networking = { networking = {
@ -113,7 +116,6 @@ in {
(builtins.readFile ../../scripts/ffmpreg.sh)) (builtins.readFile ../../scripts/ffmpreg.sh))
(writeScriptBin "split-dir" (writeScriptBin "split-dir"
(builtins.readFile ../../scripts/split-dir.sh)) (builtins.readFile ../../scripts/split-dir.sh))
(writeScriptBin "run" (builtins.readFile ../../scripts/run.sh))
(writeScriptBin "pika-list" (writeScriptBin "pika-list"
(builtins.readFile ../../scripts/pika-list.sh)) (builtins.readFile ../../scripts/pika-list.sh))

View File

@ -1,4 +1,7 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
imports = [ ./scripts/tasks.nix ]; imports = [ ./scripts/tasks.nix ./scripts/run.nix ];
my.scripts.tasks.enable = lib.mkDefault false; my.scripts = {
tasks.enable = lib.mkDefault false;
run.enable = lib.mkDefault false;
};
} }

View File

@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
options.my.script = { options.my.script = {
install = lib.mkEnableOption "Whether to install the script package";
service = lib.mkEnableOption "Whether to enable the script service";
name = lib.mkOption { name = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "my-script"; default = "my-script";
@ -22,25 +24,28 @@
}; };
}; };
config = { config = {
users.users.jawz.packages = [ config.my.script.package ]; users.users.jawz = lib.mkIf config.my.script.install {
systemd.user = with config.my.script; { packages = [ config.my.script.package ];
services."${name}" = { };
restartIfChanged = true; systemd.user = with config.my.script;
description = description; lib.mkIf config.my.script.service {
wantedBy = [ "default.target" ]; services."${name}" = {
path = [ pkgs.nix package ]; restartIfChanged = true;
serviceConfig = { description = description;
Restart = "on-failure"; wantedBy = [ "default.target" ];
RestartSec = 30; path = [ pkgs.nix package ];
ExecStart = "${package}/bin/${name}"; serviceConfig = {
Restart = "on-failure";
RestartSec = 30;
ExecStart = "${package}/bin/${name}";
};
};
timers."${name}" = {
enable = true;
description = description;
wantedBy = [ "timers.target" ];
timerConfig = { OnCalendar = timer; };
}; };
}; };
timers."${name}" = {
enable = true;
description = description;
wantedBy = [ "timers.target" ];
timerConfig = { OnCalendar = timer; };
};
};
}; };
} }

11
modules/scripts/run.nix Normal file
View File

@ -0,0 +1,11 @@
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
options.my.scripts.run.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.scripts.run.enable {
my.script = {
install = true;
package =
pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
};
};
}

View File

@ -3,11 +3,13 @@
options.my.scripts.tasks.enable = lib.mkEnableOption "enable"; options.my.scripts.tasks.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.scripts.tasks.enable { config = lib.mkIf config.my.scripts.tasks.enable {
my.script = { my.script = {
install = true;
service = true;
name = "tasks"; name = "tasks";
timer = "*:0/10"; timer = "*:0/10";
description = "runs a bunch of organizing tasks on selected directories"; description = "runs a bunch of organizing tasks on selected directories";
package = (pkgs.writeScriptBin "tasks" package =
(builtins.readFile ../../scripts/tasks.sh)); pkgs.writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh);
}; };
}; };
} }