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/file-preview-clean/assertions.nix | 7 +++++++ modules/scripts/file-preview-clean/default.nix | 22 ++++++++++++++++++++++ modules/scripts/file-preview-clean/script.sh | 1 + 3 files changed, 30 insertions(+) create mode 100644 modules/scripts/file-preview-clean/assertions.nix create mode 100644 modules/scripts/file-preview-clean/default.nix create mode 100644 modules/scripts/file-preview-clean/script.sh (limited to 'modules/scripts/file-preview-clean') diff --git a/modules/scripts/file-preview-clean/assertions.nix b/modules/scripts/file-preview-clean/assertions.nix new file mode 100644 index 0000000..b801ee3 --- /dev/null +++ b/modules/scripts/file-preview-clean/assertions.nix @@ -0,0 +1,7 @@ +{ config, ... }: +[ + { + assertion = !config.scripts.file-preview-clean.enable || config.scripts.file-preview.enable; + message = "scripts.file-preview-clean is enabled but requires `scripts.file-preview.enable`."; + } +] diff --git a/modules/scripts/file-preview-clean/default.nix b/modules/scripts/file-preview-clean/default.nix new file mode 100644 index 0000000..776e042 --- /dev/null +++ b/modules/scripts/file-preview-clean/default.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit ((import ../lib.nix { inherit lib pkgs; })) mkScriptModule; + base = mkScriptModule { + name = "file-preview-clean"; + path = ./script.sh; + description = "Clear kitty icat preview after lf exits"; + deps = [ config.terminal.kitty.package ]; + inherit config; + }; +in +{ + options = base.options; + config = base.moduleConfig // { + assertions = base.moduleConfig.assertions ++ (import ./assertions.nix { inherit config lib; }); + }; +} diff --git a/modules/scripts/file-preview-clean/script.sh b/modules/scripts/file-preview-clean/script.sh new file mode 100644 index 0000000..ee8ca73 --- /dev/null +++ b/modules/scripts/file-preview-clean/script.sh @@ -0,0 +1 @@ +exec kitten icat --clear --stdin no --transfer-mode file /dev/tty -- cgit v1.2.3