diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix index 8487157..863048c 100644 --- a/hosts/nixos/porthos/services.nix +++ b/hosts/nixos/porthos/services.nix @@ -116,13 +116,7 @@ in secretKeyFile = secrets."paperless/secret-key".path; }; # The whole *arr software suite - pirate = { - enable = true; - # ... But not Lidarr because I don't care for music that much - lidarr = { - enable = false; - }; - }; + pirate.enable = true; # Podcast automatic downloader podgrab = { enable = true; diff --git a/modules/services/pirate/default.nix b/modules/services/pirate/default.nix index 59f9794..7c341e7 100644 --- a/modules/services/pirate/default.nix +++ b/modules/services/pirate/default.nix @@ -29,7 +29,7 @@ let ]; }; - mkFail2Ban = service: lib.mkIf cfg.${service}.enable { + mkFail2Ban = service: { services.fail2ban.jails = { ${service} = '' enabled = true @@ -47,30 +47,14 @@ let }; }; - mkFullConfig = service: lib.mkIf cfg.${service}.enable (lib.mkMerge [ + mkFullConfig = service: lib.mkMerge [ (mkService service) (mkRedirection service) - ]); + ]; in { options.my.services.pirate = { enable = lib.mkEnableOption "Media automation"; - - bazarr = { - enable = lib.my.mkDisableOption "Bazarr"; - }; - - lidarr = { - enable = lib.my.mkDisableOption "Lidarr"; - }; - - radarr = { - enable = lib.my.mkDisableOption "Radarr"; - }; - - sonarr = { - enable = lib.my.mkDisableOption "Sonarr"; - }; }; config = lib.mkIf cfg.enable (lib.mkMerge [ diff --git a/modules/services/transmission/default.nix b/modules/services/transmission/default.nix index 28df477..dcba0aa 100644 --- a/modules/services/transmission/default.nix +++ b/modules/services/transmission/default.nix @@ -3,7 +3,7 @@ # Inspired by [1] # # [1]: https://github.com/delroth/infra.delroth.net/blob/master/roles/seedbox.nix -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.transmission; in @@ -45,7 +45,6 @@ in config = lib.mkIf cfg.enable { services.transmission = { enable = true; - package = pkgs.transmission_4; group = "media"; downloadDirPermissions = "775"; diff --git a/modules/services/woodpecker/agent-docker/default.nix b/modules/services/woodpecker/agent-docker/default.nix index 79d3299..b18d075 100644 --- a/modules/services/woodpecker/agent-docker/default.nix +++ b/modules/services/woodpecker/agent-docker/default.nix @@ -27,6 +27,9 @@ in # Make sure it is activated in that case my.system.docker.enable = true; + # FIXME: figure out the issue + services.unbound.resolveLocalQueries = false; + # Adjust runner service for nix usage systemd.services.woodpecker-agent-docker = { after = [ "docker.socket" ]; # Needs the socket to be available