Minor refactor + feed update

4 files changed, 51 insertions, 41 deletions

diff --git a/modules/media/default.nix b/modules/media/default.nix
index 755f18e..c883f20 100644
--- a/modules/media/default.nix
+++ b/modules/media/default.nix
@@ -4,51 +4,11 @@
 
   systemd.tmpfiles.rules = [
     "d ${settings.media.baseDir} 0755 - ${settings.media.group} - -"
-    "d ${settings.media.downloadsDir} 0770 transmission ${settings.media.group} - -"
-    "d ${settings.media.tvDir} 0770 sonarr ${settings.media.group} - -"
-    "d ${settings.media.moviesDir} 0770 radarr ${settings.media.group} - -"
-    "d ${settings.media.musicDir} 0770 lidarr ${settings.media.group} - -"
   ];
+
   users.groups.${settings.media.group} = { };
   users.users.bacchus.extraGroups = [ settings.media.group ];
 
-  services.sonarr = {
-    enable = true;
-    openFirewall = true;
-    group = settings.media.group;
-    settings = {
-      server.port = settings.network.ports.sonarr;
-      auth.enabled = false;
-    };
-  };
-
-  services.radarr = {
-    enable = true;
-    openFirewall = true;
-    group = settings.media.group;
-    settings = {
-      server.port = settings.network.ports.radarr;
-      auth.enabled = false;
-    };
-  };
-
-  services.lidarr = {
-    enable = true;
-    openFirewall = true;
-    group = settings.media.group;
-    settings = {
-      server.port = settings.network.ports.lidarr;
-    };
-  };
-
-  services.prowlarr = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      server.port = settings.network.ports.prowlarr;
-    };
-  };
-
   services.jellyfin = {
     enable = true;
     openFirewall = true;
diff --git a/modules/media/servarr.nix b/modules/media/servarr.nix
new file mode 100644
index 0000000..7c0a01b
--- /dev/null
+++ b/modules/media/servarr.nix
@@ -0,0 +1,45 @@
+{ settings, ... }:
+{
+  systemd.tmpfiles.rules = [
+    "d ${settings.media.tvDir} 0770 sonarr ${settings.media.group} - -"
+    "d ${settings.media.moviesDir} 0770 radarr ${settings.media.group} - -"
+    "d ${settings.media.musicDir} 0770 lidarr ${settings.media.group} - -"
+  ];
+
+  services.sonarr = {
+    enable = true;
+    openFirewall = true;
+    group = settings.media.group;
+    settings = {
+      server.port = settings.network.ports.sonarr;
+      auth.enabled = false;
+    };
+  };
+
+  services.radarr = {
+    enable = true;
+    openFirewall = true;
+    group = settings.media.group;
+    settings = {
+      server.port = settings.network.ports.radarr;
+      auth.enabled = false;
+    };
+  };
+
+  services.lidarr = {
+    enable = true;
+    openFirewall = true;
+    group = settings.media.group;
+    settings = {
+      server.port = settings.network.ports.lidarr;
+    };
+  };
+
+  services.prowlarr = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+      server.port = settings.network.ports.prowlarr;
+    };
+  };
+}
diff --git a/modules/media/torrent.nix b/modules/media/torrent.nix
index 1d2ee73..3430882 100644
--- a/modules/media/torrent.nix
+++ b/modules/media/torrent.nix
@@ -1,5 +1,9 @@
 { pkgs, settings, ... }:
 {
+  systemd.tmpfiles.rules = [
+    "d ${settings.media.downloadsDir} 0770 transmission ${settings.media.group} - -"
+  ];
+
   environment.systemPackages = with pkgs; [
     tremc
   ];
diff --git a/modules/rss/feeds.nix b/modules/rss/feeds.nix
index 92f274b..6f7ce8e 100644
--- a/modules/rss/feeds.nix
+++ b/modules/rss/feeds.nix
@@ -86,6 +86,7 @@ in
       (youtube "UCYO_jab_esuFRV4b17AJtAw" "3Blue 1Brown")
       (youtube "UCHnyfMqiRRG1u-2MsSQLbXA" "Veritasium")
       (youtube "UCsXVk37bltHxD1rDPwtNM8Q" "Kurzgesagt")
+      (youtube "UC6nSFpj9HTCZ5t-N3Rm3-HA" "Vsauce")
     ];
 
     "Others" = [