Added package options to all modules

nixarr/bazarr/bazarr-module/default.nix

@@ -11,6 +11,8 @@ in {
     util-nixarr.services.bazarr = {
       enable = mkEnableOption "bazarr, a subtitle manager for Sonarr and Radarr";
 
+      package = mkPackageOption pkgs "bazarr" { };
+
       openFirewall = mkOption {
         type = types.bool;
         default = false;

nixarr/bazarr/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib; let
@@ -23,6 +24,8 @@ in {
       '';
     };
 
+    package = mkPackageOption pkgs "bazarr" { };
+
     stateDir = mkOption {
       type = types.path;
       default = "${nixarr.stateDir}/bazarr";
@@ -82,6 +85,7 @@ in {
 
     util-nixarr.services.bazarr = {
       enable = cfg.enable;
+      package = cfg.package;
       user = "bazarr";
       group = "media";
       openFirewall = cfg.openFirewall;
@@ -89,14 +93,14 @@ in {
     };
 
     # Enable and specify VPN namespace to confine service in.
-    systemd.services.bazarr.vpnconfinement = mkIf cfg.vpn.enable {
+    systemd.services.bazarr.vpnConfinement = mkIf cfg.vpn.enable {
       enable = true;
-      vpnnamespace = "wg";
+      vpnNamespace = "wg";
     };
 
     # Port mappings
     # TODO: openports
-    vpnnamespaces.wg = mkIf cfg.vpn.enable {
+    vpnNamespaces.wg = mkIf cfg.vpn.enable {
       portMappings = [
         {
           from = config.bazarr.listenPort;