fujin/nixarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatted and fixed a transmission bug

Browse Source
This commit is contained in:
rasmus-kirk
2024-02-26 14:17:52 +01:00
parent 621e838f8c
commit b2ff3bb552
11 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mkDocs.nix
+3 -2
View File
@@ -17,10 +17,11 @@
optionsDocNixos = nixosOptionsDoc {
inherit (evalNixos) options;
};
in pkgs.stdenv.mkDerivation {
in
pkgs.stdenv.mkDerivation {
name = "nixdocs2html";
src = ./.;
buildInputs = with pkgs; [ pandoc ];
buildInputs = with pkgs; [pandoc];
phases = ["unpackPhase" "buildPhase"];
buildPhase = ''
tmpdir=$(mktemp -d)
nixarr/default.nix
-11
View File
@@ -161,17 +161,6 @@ in {
};
systemd.tmpfiles.rules = [
# State dirs
"d '${cfg.stateDir}' 0755 root root - -"
"d '${cfg.stateDir}/nixarr' 0755 root root - -"
"d '${cfg.stateDir}/nixarr/jellyfin' 0700 jellyfin root - -"
"d '${cfg.stateDir}/nixarr/transmission' 0700 transmission root - -"
"d '${cfg.stateDir}/nixarr/sonarr' 0700 sonarr root - -"
"d '${cfg.stateDir}/nixarr/radarr' 0700 radarr root - -"
"d '${cfg.stateDir}/nixarr/readarr' 0700 readarr root - -"
"d '${cfg.stateDir}/nixarr/lidarr' 0700 lidarr root - -"
"d '${cfg.stateDir}/nixarr/prowlarr' 0700 prowlarr root - -"
# Media dirs
"d '${cfg.mediaDir}' 0775 root media - -"
"d '${cfg.mediaDir}/library' 0775 jellyfin media - -"
nixarr/jellyfin/default.nix
+10 -6
View File
@@ -52,21 +52,25 @@ in {
#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
{
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/jellyfin' 0700 jellyfin root - -"
];
services.jellyfin = {
enable = cfg.enable;
logDir = "${cfg.stateDir}/log";
cacheDir = "${cfg.stateDir}/cache";
dataDir = "${cfg.stateDir}/data";
enable = cfg.enable;
logDir = "${cfg.stateDir}/log";
cacheDir = "${cfg.stateDir}/cache";
dataDir = "${cfg.stateDir}/data";
configDir = "${cfg.stateDir}/config";
};
networking.firewall = mkIf cfg.expose.enable {
allowedTCPPorts = [ 80 443 ];
allowedTCPPorts = [80 443];
};
util-nixarr.upnp = mkIf cfg.expose.upnp.enable {
enable = true;
openTcpPorts = [ 80 443 ];
openTcpPorts = [80 443];
};
services.nginx = mkIf (cfg.expose.enable || cfg.vpn.enable) {
nixarr/lidarr/default.nix
+4
View File
@@ -24,6 +24,10 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/lidarr' 0700 lidarr root - -"
];
services.lidarr = {
enable = cfg.enable;
user = "lidarr";
nixarr/prowlarr/default.nix
+4 -1
View File
@@ -1,6 +1,5 @@
# TODO: Dir creation and file permissions in nix
{
pkgs,
config,
lib,
...
@@ -31,6 +30,10 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/prowlarr' 0700 prowlarr root - -"
];
util-nixarr.services.prowlarr = mkIf (!cfg.vpn.enable) {
enable = true;
dataDir = cfg.stateDir;
nixarr/prowlarr/prowlarr-module/default.nix
+12 -11
View File
@@ -1,16 +1,17 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.util-nixarr.services.prowlarr;
in
{
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.util-nixarr.services.prowlarr;
in {
options = {
util-nixarr.services.prowlarr = {
enable = mkEnableOption "Prowlarr";
package = mkPackageOption pkgs "prowlarr" { };
package = mkPackageOption pkgs "prowlarr" {};
user = mkOption {
type = types.str;
@@ -45,8 +46,8 @@ in
systemd.services.prowlarr = {
description = "Prowlarr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
after = ["network.target"];
wantedBy = ["multi-user.target"];
serviceConfig = {
Type = "simple";
@@ -58,7 +59,7 @@ in
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ 9696 ];
allowedTCPPorts = [9696];
};
users.users = mkIf (cfg.user == "prowlarr") {
nixarr/radarr/default.nix
+4 -1
View File
@@ -1,6 +1,5 @@
# TODO: Dir creation and file permissions in nix
{
pkgs,
config,
lib,
...
@@ -27,6 +26,10 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/radarr' 0700 radarr root - -"
];
services.radarr = mkIf (!cfg.vpn.enable) {
enable = cfg.enable;
user = "radarr";
nixarr/readarr/default.nix
+4
View File
@@ -24,6 +24,10 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/readarr' 0700 readarr root - -"
];
services.readarr = {
enable = cfg.enable;
user = "readarr";
nixarr/sonarr/default.nix
+4
View File
@@ -30,6 +30,10 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/sonarr' 0700 sonarr root - -"
];
services.sonarr = mkIf (!cfg.vpn.enable) {
enable = cfg.enable;
user = "sonarr";
nixarr/transmission/default.nix
+9 -3
View File
@@ -17,8 +17,8 @@ in {
type = types.path;
default = "${nixarr.stateDir}/nixarr/transmission";
description = ''
The state directory for Transmission.
The state directory for Transmission.
**BUG**: Only works when the `nixarr.transmission.vpn.enable` option
is set.
'';
@@ -66,7 +66,7 @@ in {
default = {};
description = ''
Extra config settings for the Transmission service.
See the `services.transmission.settings` nixos options in
the relevant section of the `configuration.nix` manual or on
[search.nixos.org](https://search.nixos.org/options?channel=unstable&query=services.transmission.settings).
@@ -75,6 +75,12 @@ in {
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}/nixarr/transmission' 0700 transmission root - -"
# This is fixes a bug in nixpks TODO: create nixpkgs issue
"d '${cfg.stateDir}/nixarr/transmission/.config/transmission-daemon' 0700 transmission root - -"
];
services.transmission = mkIf (!cfg.vpn.enable) {
enable = true;
group = "media";
util/vpnNamespace/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ with lib; let
cfg = config.util-nixarr.vpnnamespace;
in {
options.util-nixarr.vpnnamespace = {
enable = mkEnableOption ''
enable = mkEnableOption ''
Whether to enable the VPN namespace.
To access the namespace a veth pair is used to