From aa7feed2567903129287e7bcfd37f8e1846ec4ec Mon Sep 17 00:00:00 2001 From: rasmus-kirk Date: Wed, 21 Feb 2024 15:00:32 +0100 Subject: [PATCH] updated flake --- README.md | 2 ++ docs/img/logo-1.webp | Bin 0 -> 10428 bytes flake.lock | 12 ++++---- flake.nix | 5 ---- nixarr/default.nix | 5 +--- nixarr/jellyfin/default.nix | 26 ++++++++---------- nixarr/prowlarr/default.nix | 8 ++++-- .../{module => prowlarr-module}/default.nix | 2 +- nixarr/transmission/default.nix | 4 +-- 9 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 docs/img/logo-1.webp rename nixarr/prowlarr/{module => prowlarr-module}/default.nix (98%) diff --git a/README.md b/README.md index 338c93d..536908c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Nixarr +![Logo](./docs/img/logo-1.webp) + This is a nixos module that aims to make the installation and management of running the "*Arrs" as easy, and pain free, as possible. diff --git a/docs/img/logo-1.webp b/docs/img/logo-1.webp new file mode 100644 index 0000000000000000000000000000000000000000..d5a2853faa5864875d2fb037b7e4ba17104232ec GIT binary patch literal 10428 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 D8UnBW literal 0 HcmV?d00001 diff --git a/flake.lock b/flake.lock index 275befb..eac1be6 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708294481, - "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", + "lastModified": 1708451036, + "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", "owner": "nix-community", "repo": "home-manager", - "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", + "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708407374, - "narHash": "sha256-EECzarm+uqnNDCwaGg/ppXCO11qibZ1iigORShkkDf0=", + "lastModified": 1708501555, + "narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f33dd27a47ebdf11dc8a5eb05e7c8fbdaf89e73f", + "rev": "b50a77c03d640716296021ad58950b1bb0345799", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f27866b..73a91ce 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,7 @@ }; inputs = { - #nixpkgs.url = "github:nixos/nixpkgs/22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-flood.url = "github:3JlOy-PYCCKUi/nixpkgs/flood-module"; - #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - - home-manager.url = "github:nix-community/home-manager"; flake-parts = { url = "github:hercules-ci/flake-parts"; diff --git a/nixarr/default.nix b/nixarr/default.nix index 0353fce..866f4b4 100644 --- a/nixarr/default.nix +++ b/nixarr/default.nix @@ -115,10 +115,7 @@ in { config = mkIf cfg.enable { users.groups = { - media = { - members = cfg.mediaUsers; - gid = 992; - }; + media.gid = 992; prowlarr = {}; transmission = {}; jellyfin = {}; diff --git a/nixarr/jellyfin/default.nix b/nixarr/jellyfin/default.nix index 23787fc..08f3bf1 100644 --- a/nixarr/jellyfin/default.nix +++ b/nixarr/jellyfin/default.nix @@ -25,14 +25,12 @@ in { expose = { enable = mkEnableOption '' - Enable nginx for Jellyfin, exposing the web service to the internet. + Enable expose for Jellyfin, exposing the web service to the internet. ''; - upnp = mkOption { - type = types.bool; - default = false; - description = "Use UPNP to try to open ports 80 and 443 on your router."; - }; + upnp.enable = mkEnableOption '' + Use UPNP to try to open ports 80 and 443 on your router. + ''; domainName = mkOption { type = types.nullOr types.str; @@ -50,8 +48,8 @@ in { config = # TODO: this doesn't work. I don't know why :( - #assert (!(cfg.vpn.enable && cfg.nginx.enable)) || abort "vpn.enable not compatible with nginx.enable."; - #assert (cfg.nginx.enable -> (cfg.nginx.domainName != null && cfg.nginx.acmeMail != null)) || abort "Both nginx.domain and nginx.acmeMail needs to be set if nginx.enable is set."; + #assert (!(cfg.vpn.enable && cfg.expose.enable)) || abort "vpn.enable not compatible with expose.enable."; + #assert (cfg.expose.enable -> (cfg.expose.domainName != null && cfg.expose.acmeMail != null)) || abort "Both expose.domain and expose.acmeMail needs to be set if expose.enable is set."; mkIf cfg.enable { services.jellyfin = { @@ -62,23 +60,23 @@ in { configDir = "${cfg.stateDir}/config"; }; - networking.firewall = mkIf cfg.nginx.enable { + networking.firewall = mkIf cfg.expose.enable { allowedTCPPorts = [ 80 443 ]; }; - util.upnp = mkIf cfg.nginx.upnp.enable { + util.upnp = mkIf cfg.expose.upnp.enable { enable = true; openTcpPorts = [ 80 443 ]; }; - services.nginx = mkIf (cfg.nginx.enable || cfg.vpn.enable) { + services.nginx = mkIf (cfg.expose.enable || cfg.vpn.enable) { enable = true; recommendedTlsSettings = true; recommendedOptimisation = true; recommendedGzipSettings = true; - virtualHosts."${builtins.replaceStrings ["\n"] [""] cfg.nginx.domainName}" = mkIf cfg.nginx.enable { + virtualHosts."${builtins.replaceStrings ["\n"] [""] cfg.expose.domainName}" = mkIf cfg.expose.enable { enableACME = true; forceSSL = true; locations."/" = { @@ -103,9 +101,9 @@ in { }; }; - security.acme = mkIf cfg.nginx.enable { + security.acme = mkIf cfg.expose.enable { acceptTerms = true; - defaults.email = cfg.nginx.acmeMail; + defaults.email = cfg.expose.acmeMail; }; util.vpnnamespace.portMappings = [ diff --git a/nixarr/prowlarr/default.nix b/nixarr/prowlarr/default.nix index fd8dd36..27ec568 100644 --- a/nixarr/prowlarr/default.nix +++ b/nixarr/prowlarr/default.nix @@ -11,6 +11,10 @@ with lib; let nixarr = config.nixarr; cfg = config.nixarr.prowlarr; in { + imports = [ + ./prowlarr-module + ]; + options.nixarr.prowlarr = { enable = mkEnableOption "Enable the Prowlarr service."; @@ -29,7 +33,7 @@ in { config = mkIf cfg.enable { util.services.prowlarr = mkIf (!cfg.vpn.enable) { enable = true; - dataDir = cfg.statedir; + dataDir = cfg.stateDir; }; util.vpnnamespace.portMappings = [ @@ -45,7 +49,7 @@ in { autoStart = true; ephemeral = true; extraFlags = ["--network-namespace-path=/var/run/netns/wg"]; - bindMounts."${cfg.statedir}".isReadOnly = false; + bindMounts."${cfg.stateDir}".isReadOnly = false; config = { users.groups.prowlarr = {}; diff --git a/nixarr/prowlarr/module/default.nix b/nixarr/prowlarr/prowlarr-module/default.nix similarity index 98% rename from nixarr/prowlarr/module/default.nix rename to nixarr/prowlarr/prowlarr-module/default.nix index 4044b20..4766fd3 100644 --- a/nixarr/prowlarr/module/default.nix +++ b/nixarr/prowlarr/prowlarr-module/default.nix @@ -62,7 +62,7 @@ in }; users.users = mkIf (cfg.user == "prowlarr") { - sonarr = { + prowlarr = { group = cfg.group; home = cfg.dataDir; uid = 293; diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix index de80f29..0c782c2 100644 --- a/nixarr/transmission/default.nix +++ b/nixarr/transmission/default.nix @@ -69,7 +69,7 @@ in { # TODO: This doesn't work, and it should... #home = cfg.stateDir; webHome = - if cfg.useFlood + if cfg.flood.enable then pkgs.flood-for-transmission else null; package = pkgs.transmission_4; @@ -158,7 +158,7 @@ in { # This is maybe wrong, too afraid to fix it lol group = "media"; webHome = - if cfg.useFlood + if cfg.flood.enable then pkgs.flood-for-transmission else null; package = pkgs.transmission_4;