From b32deb062b68db4620f17767615814e2ef249503 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 5 Oct 2023 09:27:38 +0200
Subject: [PATCH] migrated media stuff on robi

---
 nixos/machines/robi/configuration.nix         | 10 +++++----
 .../robi/{jellyfin.nix => media-jellyfin.nix} | 13 ++++++------
 nixos/machines/robi/media-share.nix           | 21 +++++++++++++++++++
 .../{syncthing.nix => media-syncthing.nix}    |  1 +
 ...ransmission.nix => media-transmission.nix} |  0
 ...nsmission2.nix => media-transmission2.nix} |  0
 6 files changed, 35 insertions(+), 10 deletions(-)
 rename nixos/machines/robi/{jellyfin.nix => media-jellyfin.nix} (76%)
 create mode 100644 nixos/machines/robi/media-share.nix
 rename nixos/machines/robi/{syncthing.nix => media-syncthing.nix} (98%)
 rename nixos/machines/robi/{transmission.nix => media-transmission.nix} (100%)
 rename nixos/machines/robi/{transmission2.nix => media-transmission2.nix} (100%)

diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index df47b72..ef3f9e8 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -21,16 +21,18 @@
     ./gitea.nix
     ./nextcloud.nix
     ./packages.nix
-    ./syncthing.nix
     ./taskserver.nix
     ./tinc.nix
-    ./transmission.nix
-    ./transmission2.nix
     ./vaultwarden.nix
     ./nginx.nix
     ./nginx-wkd.nix
     ./wireguard.nix
-    ./jellyfin.nix
+
+    ./media-share.nix
+    ./media-jellyfin.nix
+    ./media-syncthing.nix
+    ./media-transmission.nix
+    ./media-transmission2.nix
 
     #./social-jitsi.nix
 
diff --git a/nixos/machines/robi/jellyfin.nix b/nixos/machines/robi/media-jellyfin.nix
similarity index 76%
rename from nixos/machines/robi/jellyfin.nix
rename to nixos/machines/robi/media-jellyfin.nix
index 7647c2f..39f0af4 100644
--- a/nixos/machines/robi/jellyfin.nix
+++ b/nixos/machines/robi/media-jellyfin.nix
@@ -1,18 +1,19 @@
 { config, lib, pkgs, ... }:
 {
-  services.jellyfin.enable = true;
-  services.jellyfin.openFirewall = false;
 
-  #services.jellyfin.user = toString config.ids.gids.transmission;
-  #services.jellyfin.group = toString config.ids.gids.transmission;
-
-  users.groups."syncthing".members = [ "jellyfin" ];
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+    group = "media";
+    user = "media";
+  };
 
   hardware.opengl = {
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
   };
+
   services.nginx =
     let
       flixConfig = {
diff --git a/nixos/machines/robi/media-share.nix b/nixos/machines/robi/media-share.nix
new file mode 100644
index 0000000..86a1080
--- /dev/null
+++ b/nixos/machines/robi/media-share.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+{
+
+  users.groups."media".gid = config.ids.gids.transmission;
+  users.users."media" = {
+    uid = config.ids.uids.transmission;
+    useDefaultShell = true;
+    home = "/home/media";
+    createHome = true;
+    group = "media";
+  };
+
+  services.permown."/media/media" = {
+    owner = "media";
+    group = "media";
+    directory-mode = "770";
+    file-mode = "770";
+  };
+
+
+}
diff --git a/nixos/machines/robi/syncthing.nix b/nixos/machines/robi/media-syncthing.nix
similarity index 98%
rename from nixos/machines/robi/syncthing.nix
rename to nixos/machines/robi/media-syncthing.nix
index 30ffab8..d863c2d 100644
--- a/nixos/machines/robi/syncthing.nix
+++ b/nixos/machines/robi/media-syncthing.nix
@@ -62,6 +62,7 @@
   };
 
   services.permown."/media/syncthing" = {
+    # not managed by syncthing anymore
     owner = "syncthing";
     group = "syncthing";
     umask = "0002";
diff --git a/nixos/machines/robi/transmission.nix b/nixos/machines/robi/media-transmission.nix
similarity index 100%
rename from nixos/machines/robi/transmission.nix
rename to nixos/machines/robi/media-transmission.nix
diff --git a/nixos/machines/robi/transmission2.nix b/nixos/machines/robi/media-transmission2.nix
similarity index 100%
rename from nixos/machines/robi/transmission2.nix
rename to nixos/machines/robi/media-transmission2.nix