Added package options to all modules

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
 
+## 2024-09-19
+
+Added:
+- Options to control the package of each service
+- sub-merge package to systemPkgs
+
+Updated:
+- All submodules (notably VPNConfinement)
+
 ## 2024-06-11
 
 Updated:
 - VPNConfinement submodule
 
-
 ## 2024-03-12
 
 Added:

flake.nix

@@ -28,12 +28,12 @@
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs @ {
+  outputs = {
     flake-parts,
     vpnconfinement,
     sub-merge,
     ...
-  }:
+  } @ inputs:
     flake-parts.lib.mkFlake {
       inherit inputs;
     } {
@@ -48,9 +48,9 @@
 
       flake = {
         nixosModules = rec {
-          nixarr = import ./nixarr vpnconfinement;
+          nixarr = import ./nixarr sub-merge vpnconfinement;
           imports = [ vpnconfinement.nixosModules.default ];
-          specialArgs = { inherit inputs; };
+          #specialArgs = { inherit sub-merge; };
           default = nixarr;
         };
       };

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,21 +85,22 @@ in {
 
     util-nixarr.services.bazarr = {
       enable = cfg.enable;
+      package = cfg.package;
       user = "bazarr";
       group = "media";
       openFirewall = cfg.openFirewall;
       dataDir = cfg.stateDir;
     };
 
     # 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;

nixarr/ddns/default.nix

@@ -196,9 +196,9 @@ in {
         ddnsNjallaVpn = {
           description = "Sets the Njalla DDNS records over VPN";
 
-          vpnconfinement = {
+          vpnConfinement = {
             enable = true;
-            vpnnamespace = "wg";
+            vpnNamespace = "wg";
           };
 
           serviceConfig = {

nixarr/default.nix

@@ -1,6 +1,8 @@
-vpnconfinement: {...}: {
+sub-merge: vpnconfinement: { pkgs, ... }: {
   imports = [
     vpnconfinement.nixosModules.default
     ./nixarr.nix
   ];
+
+  config.environment.systemPackages = [ sub-merge.packages."${pkgs.system}".default ];
 }

nixarr/jellyfin/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   cfg = config.nixarr.jellyfin;
@@ -20,6 +21,8 @@ in
         '';
       };
 
+      package = mkPackageOption pkgs "jellyfin" { };
+
       stateDir = mkOption {
         type = types.path;
         default = "${nixarr.stateDir}/jellyfin";
@@ -224,6 +227,7 @@ in
 
         services.jellyfin = {
           enable = cfg.enable;
+          package = cfg.package;
           user = "streamer";
           group = "media";
           openFirewall = cfg.openFirewall;
@@ -295,14 +299,14 @@ in
         };
 
         # Enable and specify VPN namespace to confine service in.
-        systemd.services.jellyfin.vpnconfinement = mkIf cfg.vpn.enable {
+        systemd.services.jellyfin.vpnConfinement = mkIf cfg.vpn.enable {
           enable = true;
-          vpnnamespace = "wg";
+          vpnNamespace = "wg";
         };
 
         # Port mappings
         # TODO: openports if expose.vpn
-        vpnnamespaces.wg = mkIf cfg.vpn.enable {
+        vpnNamespaces.wg = mkIf cfg.vpn.enable {
           portMappings = [
             {
               from = defaultPort;