Refactor: separate out cli options

Author: srid

nix/flake-module.nix

@@ -1,12 +1,11 @@
-{ self, lib, flake-parts-lib, ... }:
+{ lib, flake-parts-lib, ... }:
 let
   inherit (flake-parts-lib)
     mkPerSystemOption;
   inherit (lib)
     mdDoc
     mkOption
-    types
-    literalExpression;
+    types;
 in
 {
   options.perSystem = mkPerSystemOption ({ config, pkgs, lib, ... }:

nix/process-compose/cli.nix

@@ -0,0 +1,42 @@
+{ config, lib, ... }: 
+
+let 
+  inherit (lib) types mkOption;
+in 
+{
+  options = {
+    port = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Port to serve process-compose's Swagger API on.
+      '';
+    };
+    tui = mkOption {
+      type = types.nullOr types.bool;
+      default = null;
+      description = "Enable or disable the TUI for the application.";
+    };
+    extraCliArgs =
+      let
+        cliArgsAttr = {
+          port = "-p ${toString config.port}";
+          tui = "-t=${lib.boolToString config.tui}";
+        };
+        getCliArgs =
+          lib.mapAttrsToList
+            (opt: arg: lib.optionalString (config.${opt} != null) arg)
+            cliArgsAttr;
+      in
+      mkOption {
+        type = types.str;
+        default = lib.concatStringsSep " " getCliArgs;
+        internal = true;
+        readOnly = true;
+        description = ''
+          Extra command-line arguments to pass to process-compose.
+        '';
+      };
+  };
+}
+

nix/process-compose/default.nix

@@ -1,10 +1,11 @@
 { name, config, pkgs, lib, ... }: 
 
 let 
-  inherit (lib) types mkOption literalExpression;
+  inherit (lib) types mkOption;
 in 
 {
   imports = [
+    ./cli.nix
     ./settings.nix
   ];
 
@@ -17,38 +18,6 @@ in
         The process-compose package to bundle up in the command package and flake app.
       '';
     };
-    port = mkOption {
-      type = types.nullOr types.int;
-      default = null;
-      description = ''
-        Port to serve process-compose's Swagger API on.
-      '';
-    };
-    tui = mkOption {
-      type = types.nullOr types.bool;
-      default = null;
-      description = "Enable or disable the TUI for the application.";
-    };
-    extraCliArgs =
-      let
-        cliArgsAttr = {
-          port = "-p ${toString config.port}";
-          tui = "-t=${lib.boolToString config.tui}";
-        };
-        getCliArgs =
-          lib.mapAttrsToList
-            (opt: arg: lib.optionalString (config.${opt} != null) arg)
-            cliArgsAttr;
-      in
-      mkOption {
-        type = types.str;
-        default = lib.concatStringsSep " " getCliArgs;
-        internal = true;
-        readOnly = true;
-        description = ''
-          Extra command-line arguments to pass to process-compose.
-        '';
-      };
     outputs.package = mkOption {
       type = types.package;
       description = ''

nix/process-compose/settings.nix

@@ -31,6 +31,7 @@ in
       internal = true;
     };
   };
+
   config.settingsYaml =
     let
       toYAMLFile =