From 765f2e290ecfd605905d0859882d4d3447839390 Mon Sep 17 00:00:00 2001 From: rasmus-kirk Date: Tue, 20 Feb 2024 16:56:29 +0100 Subject: [PATCH] Updated module --- mkDocs.nix | 2 +- servarr/default.nix | 9 ++++++--- servarr/jellyfin/default.nix | 9 +++++---- servarr/lidarr/default.nix | 9 +++++---- servarr/prowlarr/default.nix | 10 +++++----- servarr/radarr/default.nix | 10 +++++----- servarr/readarr/default.nix | 9 +++++---- servarr/sonarr/default.nix | 10 +++++----- servarr/transmission/default.nix | 8 ++++---- util/upnp/default.nix | 4 ++-- util/vpnNamespace/default.nix | 4 ++-- 11 files changed, 45 insertions(+), 39 deletions(-) diff --git a/mkDocs.nix b/mkDocs.nix index 12d24eb..ea8aabd 100644 --- a/mkDocs.nix +++ b/mkDocs.nix @@ -12,7 +12,7 @@ { config._module.check = false; } - inputs.home-manager.nixosModules.default + #inputs.home-manager.nixosModules.default ./servarr ]; }; diff --git a/servarr/default.nix b/servarr/default.nix index b0dec7e..ff84cd6 100644 --- a/servarr/default.nix +++ b/servarr/default.nix @@ -4,7 +4,7 @@ ... }: with lib; let - cfg = config.kirk.servarr; + cfg = config.servarr; in { imports = [ ./jellyfin @@ -14,10 +14,9 @@ in { ./sonarr ./prowlarr ./transmission - ../util ]; - options.kirk.servarr = { + options.servarr = { enable = mkEnableOption '' My servarr setup. Lets you host the servarr services optionally through a VPN. It is possible, BUT NOT RECOMENDED, to have @@ -113,6 +112,10 @@ in { }; config = mkIf cfg.enable { + imports = [ + ../util + ]; + users.groups = { media = { members = cfg.mediaUsers; diff --git a/servarr/jellyfin/default.nix b/servarr/jellyfin/default.nix index a114dbb..d53a1a1 100644 --- a/servarr/jellyfin/default.nix +++ b/servarr/jellyfin/default.nix @@ -4,11 +4,12 @@ ... }: with lib; let - cfg = config.kirk.servarr.jellyfin; + cfg = config.servarr.jellyfin; defaultPort = 8096; - servarr = config.kirk.servarr; + servarr = config.servarr; + dnsServers = config.lib.vpn.dnsServers; in { - options.kirk.servarr.jellyfin = { + options.servarr.jellyfin = { enable = mkOption { type = types.bool; default = false; @@ -96,7 +97,7 @@ in { defaults.email = cfg.nginx.acmeMail; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ ( mkIf cfg.useVpn { From = defaultPort; diff --git a/servarr/lidarr/default.nix b/servarr/lidarr/default.nix index eb752f2..bc073e0 100644 --- a/servarr/lidarr/default.nix +++ b/servarr/lidarr/default.nix @@ -4,10 +4,11 @@ ... }: with lib; let - cfg = config.kirk.servarr.lidarr; - servarr = config.kirk.servarr; + cfg = config.servarr.lidarr; + dnsServers = config.lib.vpn.dnsServers; + servarr = config.servarr; in { - options.kirk.servarr.lidarr = { + options.servarr.lidarr = { enable = mkOption { type = types.bool; default = false; @@ -35,7 +36,7 @@ in { dataDir = cfg.stateDir; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ ( mkIf cfg.useVpn { From = defaultPort; diff --git a/servarr/prowlarr/default.nix b/servarr/prowlarr/default.nix index e99ba66..b830999 100644 --- a/servarr/prowlarr/default.nix +++ b/servarr/prowlarr/default.nix @@ -7,11 +7,11 @@ }: with lib; let defaultPort = 9696; - dnsServers = config.kirk.vpnnamespace.dnsServer; - servarr = config.kirk.servarr; - cfg = config.kirk.servarr.prowlarr; + dnsServers = config.lib.vpn.dnsServers; + servarr = config.servarr; + cfg = config.servarr.prowlarr; in { - options.kirk.servarr.prowlarr = { + options.servarr.prowlarr = { enable = mkOption { type = types.bool; default = false; @@ -39,7 +39,7 @@ in { openFirewall = true; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ ( mkIf cfg.useVpn { From = defaultPort; diff --git a/servarr/radarr/default.nix b/servarr/radarr/default.nix index 8faef19..6431078 100644 --- a/servarr/radarr/default.nix +++ b/servarr/radarr/default.nix @@ -6,12 +6,12 @@ ... }: with lib; let - cfg = config.kirk.servarr.radarr; + cfg = config.servarr.radarr; defaultPort = 7878; - servarr = config.kirk.servarr; - dnsServers = config.kirk.vpnnamespace.dnsServers; + servarr = config.servarr; + dnsServers = config.lib.vpn.dnsServers; in { - options.kirk.servarr.radarr = { + options.servarr.radarr = { enable = mkOption { type = types.bool; default = false; @@ -39,7 +39,7 @@ in { dataDir = cfg.stateDir; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ ( mkIf cfg.useVpn { From = defaultPort; diff --git a/servarr/readarr/default.nix b/servarr/readarr/default.nix index 5c6bdeb..a3bb79a 100644 --- a/servarr/readarr/default.nix +++ b/servarr/readarr/default.nix @@ -4,10 +4,11 @@ ... }: with lib; let - cfg = config.kirk.servarr.readarr; - servarr = config.kirk.servarr; + cfg = config.servarr.readarr; + servarr = config.servarr; + dnsServers = config.lib.vpn.dnsServers; in { - options.kirk.servarr.readarr = { + options.servarr.readarr = { enable = mkOption { type = types.bool; default = false; @@ -35,7 +36,7 @@ in { dataDir = cfg.stateDir; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ ( mkIf cfg.useVpn { From = defaultPort; diff --git a/servarr/sonarr/default.nix b/servarr/sonarr/default.nix index 02653c6..7e84282 100644 --- a/servarr/sonarr/default.nix +++ b/servarr/sonarr/default.nix @@ -5,12 +5,12 @@ ... }: with lib; let - cfg = config.kirk.servarr.sonarr; + cfg = config.servarr.sonarr; defaultPort = 8989; - servarr = config.kirk.servarr; - dnsServers = config.kirk.vpnnamespace.dnsServers; + servarr = config.servarr; + dnsServers = config.lib.vpn.dnsServers; in { - options.kirk.servarr.sonarr = { + options.servarr.sonarr = { enable = mkOption { type = types.bool; default = false; @@ -38,7 +38,7 @@ in { dataDir = cfg.stateDir; }; - kirk.vpnnamespace.portMappings = [ + util.vpnnamespace.portMappings = [ (mkIf cfg.useVpn { From = defaultPort; To = defaultPort; diff --git a/servarr/transmission/default.nix b/servarr/transmission/default.nix index f5a1303..eea6be1 100644 --- a/servarr/transmission/default.nix +++ b/servarr/transmission/default.nix @@ -6,11 +6,11 @@ ... }: with lib; let - cfg = config.kirk.servarr.transmission; - servarr = config.kirk.servarr; + cfg = config.servarr.transmission; + servarr = config.servarr; dnsServers = config.lib.vpn.dnsServers; in { - options.kirk.servarr.transmission = { + options.servarr.transmission = { enable = mkOption { type = types.bool; default = false; @@ -100,7 +100,7 @@ in { // cfg.extraConfig; }; - kirk.vpnnamespace = mkIf cfg.useVpn { + util.vpnnamespace = mkIf cfg.useVpn { portMappings = [ { From = cfg.uiPort; diff --git a/util/upnp/default.nix b/util/upnp/default.nix index 299af3f..e180f96 100644 --- a/util/upnp/default.nix +++ b/util/upnp/default.nix @@ -6,9 +6,9 @@ ... }: with lib; let - cfg = config.kirk.upnp; + cfg = config.util.upnp; in { - options.kirk.upnp = { + options.util.upnp = { enable = mkEnableOption "Enable port forwarding using UPNP."; openTcpPorts = mkOption { diff --git a/util/vpnNamespace/default.nix b/util/vpnNamespace/default.nix index 704970d..8aebd11 100644 --- a/util/vpnNamespace/default.nix +++ b/util/vpnNamespace/default.nix @@ -10,9 +10,9 @@ # the namespace should use a vpn or not. with builtins; with lib; let - cfg = config.kirk.vpnnamespace; + cfg = config.util.vpnnamespace; in { - options.kirk.vpnnamespace = { + options.util.vpnnamespace = { enable = mkEnableOption (lib.mdDoc "VPN Namespace") // {