updates and formatting

hosts/nas/apps/arrs/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
   radarrPort = 7878;
@@ -14,7 +19,8 @@ let
   mediaDir = "/media";
   arrUserId = config.users.users.nix-apps.uid;
   arrGroupId = config.users.groups.jallen-nas.gid;
-  # sonarrPkg = pkgs.stable.sonarr;
+  sonarrPkg = pkgs.stable.sonarr;
+  jackettPkg = pkgs.unstable.jackett;
 in
 {
   nixpkgs.config.permittedInsecurePackages = [
@@ -29,115 +35,129 @@ in
     privateNetwork = true;
     hostAddress = "10.0.1.18";
     localAddress = "10.0.1.51";
-    
-    config = { config, pkgs, lib, ... }: {
-      nixpkgs.config.allowUnfree = true;
-      nixpkgs.config.permittedInsecurePackages = [
-        "aspnetcore-runtime-6.0.36"
-        "aspnetcore-runtime-wrapped-6.0.36"
-        "dotnet-sdk-6.0.428"
-        "dotnet-sdk-wrapped-6.0.428"
-      ];
-      
-      # Enable radarr service
-      services.radarr = {
-        enable = true;
-        openFirewall = true;
-        user = "arrs";
-        group = "media";
-        dataDir = radarrDataDir;
-      };
 
-      # Enable Sonarr service
-      services.sonarr = {
-        enable = true;
-        openFirewall = true;
-        user = "arrs";
-        group = "media";
-        dataDir = sonarrDataDir;
-        # package = sonarrPkg;
-      };
+    config =
+      {
+        config,
+        pkgs,
+        lib,
+        ...
+      }:
+      {
+        nixpkgs.config.allowUnfree = true;
+        nixpkgs.config.permittedInsecurePackages = [
+          "aspnetcore-runtime-6.0.36"
+          "aspnetcore-runtime-wrapped-6.0.36"
+          "dotnet-sdk-6.0.428"
+          "dotnet-sdk-wrapped-6.0.428"
+        ];
 
-      # Enable Sabnzbd service
-      services.sabnzbd = {
-        enable = true;
-        openFirewall = true;
-        user = "arrs";
-        group = "media";
-        configFile = "${sabnzbdConfig}/sabnzbd.ini";
-      };
-
-      services.deluge = {
-        enable = true;
-        user = "arrs";
-        group = "media";
-        openFirewall = true;
-        dataDir = "/media";
-        web = {
+        # Enable radarr service
+        services.radarr = {
           enable = true;
-          port = 8112;
           openFirewall = true;
+          user = "arrs";
+          group = "media";
+          dataDir = radarrDataDir;
         };
-      };
 
-      services.jackett = {
-        enable = true;
-        user = "arrs";
-        group = "media";
-        openFirewall = true;
-      };
+        # Enable Sonarr service
+        services.sonarr = {
+          enable = true;
+          openFirewall = true;
+          user = "arrs";
+          group = "media";
+          dataDir = sonarrDataDir;
+          # package = sonarrPkg;
+        };
 
-      # Create required users and groups
-      users.users.arrs = {
-        isSystemUser = true;
-        uid = lib.mkForce arrUserId;
-        group = "media";
-        extraGroups = [ "downloads" ];
-      };
+        # Enable Sabnzbd service
+        services.sabnzbd = {
+          enable = true;
+          openFirewall = true;
+          user = "arrs";
+          group = "media";
+          configFile = "${sabnzbdConfig}/sabnzbd.ini";
+        };
 
-      users.groups = {
-        media = { gid = lib.mkForce arrGroupId; };
-        downloads = {};
-      };
+        services.deluge = {
+          enable = true;
+          user = "arrs";
+          group = "media";
+          openFirewall = true;
+          dataDir = "/media";
+          web = {
+            enable = true;
+            port = 8112;
+            openFirewall = true;
+          };
+        };
 
-      # System packages
-      environment.systemPackages = with pkgs; [
-        glib
-        sqlite
-        mono
-        mediainfo
-        protonvpn-cli_2
-      ];
+        services.jackett = {
+          enable = true;
+          user = "arrs";
+          group = "media";
+          openFirewall = true;
+          package = jackettPkg;
+        };
 
-      # Create and set permissions for required directories
-      system.activationScripts.radarr-dirs = ''
-        mkdir -p ${radarrDataDir}
-        mkdir -p ${sonarrDataDir}
-        mkdir -p ${sabnzbdConfig}
-        mkdir -p ${downloadDir}
-        mkdir -p ${incompleteDir}
-        mkdir -p ${mediaDir}
+        # Create required users and groups
+        users.users.arrs = {
+          isSystemUser = true;
+          uid = lib.mkForce arrUserId;
+          group = "media";
+          extraGroups = [ "downloads" ];
+        };
 
-        chown -R arrs:media ${radarrDataDir}
-        chown -R arrs:media ${sonarrDataDir}
-        chown -R arrs:media ${sabnzbdConfig}
-        chown -R arrs:media ${downloadDir}
-        chown -R arrs:media ${incompleteDir}
-        chown -R arrs:media ${mediaDir}
-        
-        chmod -R 775 ${radarrDataDir}
-        chmod -R 775 ${sonarrDataDir}
-        chmod -R 775 ${sabnzbdConfig}
-        chmod -R 775 ${downloadDir}
-        chmod -R 775 ${incompleteDir}
-        chmod -R 775 ${mediaDir}
-        
-      '';
+        users.groups = {
+          media = {
+            gid = lib.mkForce arrGroupId;
+          };
+          downloads = { };
+        };
+
+        # System packages
+        environment.systemPackages = with pkgs; [
+          glib
+          sqlite
+          mono
+          mediainfo
+          protonvpn-cli_2
+        ];
+
+        # Create and set permissions for required directories
+        system.activationScripts.radarr-dirs = ''
+          mkdir -p ${radarrDataDir}
+          mkdir -p ${sonarrDataDir}
+          mkdir -p ${sabnzbdConfig}
+          mkdir -p ${downloadDir}
+          mkdir -p ${incompleteDir}
+          mkdir -p ${mediaDir}
+
+          chown -R arrs:media ${radarrDataDir}
+          chown -R arrs:media ${sonarrDataDir}
+          chown -R arrs:media ${sabnzbdConfig}
+          chown -R arrs:media ${downloadDir}
+          chown -R arrs:media ${incompleteDir}
+          chown -R arrs:media ${mediaDir}
+
+          chmod -R 775 ${radarrDataDir}
+          chmod -R 775 ${sonarrDataDir}
+          chmod -R 775 ${sabnzbdConfig}
+          chmod -R 775 ${downloadDir}
+          chmod -R 775 ${incompleteDir}
+          chmod -R 775 ${mediaDir}
+
+        '';
 
         networking = {
           firewall = {
             enable = true;
-            allowedTCPPorts = [ radarrPort sonarrPort sabnzbdPort ];
+            allowedTCPPorts = [
+              radarrPort
+              sonarrPort
+              sabnzbdPort
+            ];
           };
           # Use systemd-resolved inside the container
           # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
@@ -213,4 +233,4 @@ in
       }
     ];
   };
-}
+}