refactor: adding explicit options to enable scripts

- some scripts that are not critical to the functioning of other
  options, can be enabled/disabled

1 files changed, 36 insertions, 14 deletions

diff --git a/modules/networking/usque/default.nix b/modules/networking/usque/default.nix
index 9d04ab7..ffde47a 100644
--- a/modules/networking/usque/default.nix
+++ b/modules/networking/usque/default.nix
@@ -6,21 +6,32 @@
   ...
 }:
 let
-  inherit ((import ../../lib/script.nix { inherit lib pkgs; })) mkScriptModule;
-  usqueWarp = mkScriptModule {
-    scope = [
-      "networking"
-      "usque"
-    ];
+  usqueWarpScript = pkgs.writeShellApplication {
     name = "usque-warp";
-    path = ./usque-warp.sh;
-    description = "Connect/disconnect to Cloudflare WARP via usque MASQUE tunnel";
-    deps = [
+    runtimeInputs = [
       config.networking.usque.package
       pkgs.bash
     ];
-    completion.zsh = builtins.readFile ./usque-warp.zsh;
-    inherit config;
+    text = builtins.readFile ./usque-warp.sh;
+  };
+
+  usqueWarpCompletion =
+    pkgs.runCommand "usque-warp-completion"
+      {
+        nativeBuildInputs = [ pkgs.installShellFiles ];
+      }
+      ''
+        mkdir -p $out/share/zsh/site-functions
+        installShellCompletion --zsh --name _usque-warp ${pkgs.writeText "usque-warp.zsh" (builtins.readFile ./usque-warp.zsh)}
+      '';
+
+  usqueWarpScriptPkg = pkgs.symlinkJoin {
+    name = "usque-warp";
+    paths = [
+      usqueWarpScript
+      usqueWarpCompletion
+    ];
+    meta = usqueWarpScript.meta or { };
   };
 in
 {
@@ -31,13 +42,24 @@ in
       default = pkgs.usque;
       description = "The usque package to use.";
     };
-  }
-  // usqueWarp.options.networking.usque;
+
+    warp = {
+      enable = lib.mkEnableOption "Enables the usque-warp script.";
+      package = lib.mkOption {
+        type = lib.types.package;
+        readOnly = true;
+        default = usqueWarpScriptPkg;
+        description = "The usque-warp script package.";
+      };
+    };
+  };
 
   config = lib.mkMerge [
     (lib.mkIf config.networking.usque.enable {
       home.packages = [ config.networking.usque.package ];
     })
-    usqueWarp.config
+    (lib.mkIf config.networking.usque.warp.enable {
+      home.packages = [ config.networking.usque.warp.package ];
+    })
   ];
 }