From 03bd9b6ad5335aff65d9cb6fb1d117b5cb4b7919 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sat, 18 Jul 2026 14:55:21 +0530 Subject: refactor(scripts): split monolithic module into per-script submodules Extract shared `mkScript` and `mkScriptModule` helpers into `lib.nix` Split each script into `modules/scripts//` with its own `default.nix`, `script.sh`, and `assertions.nix` Remove `conditions` parameter from `mkScriptModule`; move condition assertions into per-script `assertions.nix` files with inline checks and error messages Simplify `mkScriptModule` to return `{ options, moduleConfig }` instead of a module function, taking `config` as a direct parameter Add `description` field to `mkScript` that inserts the description as a `# ` comment between the shebang and env vars Thread `description` through `mkScriptModule` to each `default.nix` Move top comment lines from each `script.sh` into the `description` field and remove from sources to avoid duplication Remove old flat `.sh` files from `modules/scripts/` root --- modules/scripts/aria2-run/assertions.nix | 7 +++++++ modules/scripts/aria2-run/default.nix | 26 ++++++++++++++++++++++++++ modules/scripts/aria2-run/script.sh | 1 + 3 files changed, 34 insertions(+) create mode 100644 modules/scripts/aria2-run/assertions.nix create mode 100644 modules/scripts/aria2-run/default.nix create mode 100644 modules/scripts/aria2-run/script.sh (limited to 'modules/scripts/aria2-run') diff --git a/modules/scripts/aria2-run/assertions.nix b/modules/scripts/aria2-run/assertions.nix new file mode 100644 index 0000000..8d1e1cd --- /dev/null +++ b/modules/scripts/aria2-run/assertions.nix @@ -0,0 +1,7 @@ +{ config, ... }: +[ + { + assertion = !config.scripts.aria2-run.enable || config.web.aria2.enable; + message = "scripts.aria2-run is enabled but requires `web.aria2.enable`."; + } +] diff --git a/modules/scripts/aria2-run/default.nix b/modules/scripts/aria2-run/default.nix new file mode 100644 index 0000000..0cdc456 --- /dev/null +++ b/modules/scripts/aria2-run/default.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit ((import ../lib.nix { inherit lib pkgs; })) mkScriptModule; + base = mkScriptModule { + name = "aria2-run"; + path = ./script.sh; + description = "Start aria2 RPC daemon"; + deps = [ config.web.aria2.package ]; + desktop = { + enable = true; + displayName = "Aria2 Download Manager"; + }; + inherit config; + }; +in +{ + options = base.options; + config = base.moduleConfig // { + assertions = base.moduleConfig.assertions ++ (import ./assertions.nix { inherit config lib; }); + }; +} diff --git a/modules/scripts/aria2-run/script.sh b/modules/scripts/aria2-run/script.sh new file mode 100644 index 0000000..167fc5d --- /dev/null +++ b/modules/scripts/aria2-run/script.sh @@ -0,0 +1 @@ +aria2c --enable-rpc --rpc-listen-all=false --rpc-listen-port=6800 -- cgit v1.2.3