preHook and postHook actually belong in 'cli'

CHANGELOG.md

@@ -3,8 +3,10 @@
 ## Unreleased
 
 - New features
-    - #81: Support for specifying process-compose global CLI options
-      - **Breaking change**: Old options `httpServer` and `tui` were removed; users should use the new `cli` module to set all process-compose cli arguments and options.
+    - #81, #84: Support for specifying process-compose global CLI options
+      - **Breaking changes**:
+        - `preHook` and `postHook` are now inside `cli` module.
+        - Old options `httpServer` and `tui` were removed; users should use the new `cli` module to set all process-compose cli arguments and options.
     - ~~#18: Add `testScript` option for adding flake checks based on nixosTest library.~~
     - #39: Allow `test` process to act as a test, which then gets run as part of flake checks.
     - #55: Add `lib` flake output - library of useful functions

nix/process-compose/cli-options.nix

@@ -5,6 +5,16 @@ in
 {
   options = {
     cli = {
+      preHook = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to run before process-compose starts.";
+      };
+      postHook = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to run after process-compose completes.";
+      };
       options = mkOption {
         description = "CLI options to pass to process-compose binary";
         default = { };

nix/process-compose/default.nix

@@ -5,7 +5,6 @@ let
 in
 {
   imports = [
-    ./cli.nix
     ./cli-options.nix
     ./settings
     ./test.nix
@@ -60,7 +59,7 @@ in
         mkProcessComposeWrapper
           {
             inherit name;
-            inherit (config) preHook postHook;
+            inherit (config.cli) preHook postHook;
             cliOutputs = config.cli.outputs;
             configFile = config.outputs.settingsFile;
           };
@@ -71,7 +70,7 @@ in
           mkProcessComposeWrapper
             {
               name = "${name}-test";
-              inherit (config) preHook postHook;
+              inherit (config.cli) preHook postHook;
               cliOutputs = config.cli.outputs;
               configFile = config.outputs.settingsTestFile;
             }