don't use jellyfin

2 files changed, 38 insertions, 47 deletions

diff --git a/machines/rivendell.nix b/machines/rivendell.nix
index 7e2d52d..a2ca15b 100644
--- a/machines/rivendell.nix
+++ b/machines/rivendell.nix
@@ -1,6 +1,5 @@
 {
   adminUser,
-  pkgs,
   lib,
   config,
   ...
@@ -24,11 +23,12 @@
     ../profiles/users/builder.nix
     ../profiles/users/home-manager.nix
     ../profiles/wireguard.nix
-    ../profiles/workstation.nix
   ];
 
   boot.kernelModules = [ "sg" ];
 
+  age.secrets.rsync-ssh-key.file = ../secrets/rsync-ssh-nas.age;
+
   networking.hostName = "rivendell";
   networking.useDHCP = lib.mkDefault true;
   systemd.network.wait-online.anyInterface = lib.mkDefault config.networking.useDHCP;
@@ -44,50 +44,8 @@
       "/data/media/music"
       "/var/lib/gitolite/repositories"
     ];
-    samba = {
-      enable = true;
-      openFirewall = true;
-      settings = {
-        global = {
-          security = "user";
-          workgroup = "WORKGROUP";
-          "server string" = config.networking.hostName;
-          "netbios name" = config.networking.hostName;
-          "hosts allow" = "192.168.1.0/24 10.100.0.0/24 localhost";
-          "guest account" = "nobody";
-          "map to guest" = "bad user";
-          "use sendfile" = true;
-          "load printers" = false;
-          "vfs objects" = "fruit streams_xattr";
-          "fruit:metadata" = "stream";
-          "mangled names" = false;
-        };
-
-        media = {
-          path = "/data/media";
-          browseable = "yes";
-          "read only" = "yes";
-          "guest ok" = "yes";
-        };
-      };
-    };
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-    jellyfin = {
-      enable = true;
-      openFirewall = true;
-    };
   };
 
-  environment.systemPackages = with pkgs; [
-    ffmpeg
-    imagemagick
-    makemkv
-  ];
-
   users.users.${adminUser.name}.extraGroups = [ "cdrom" ];
 
   system.stateVersion = "23.11";
@@ -96,7 +54,6 @@
     home.homeDirectory = "/home/${adminUser.name}";
     imports = [
       ../home/profiles/minimal.nix
-      ../home/profiles/workstation.nix
     ];
   };
 }
diff --git a/profiles/storage-media.nix b/profiles/storage-media.nix
index 29f6f27..9acb007 100644
--- a/profiles/storage-media.nix
+++ b/profiles/storage-media.nix
@@ -16,12 +16,46 @@ let
   remoteUser = "nas";
 in
 {
-  age.secrets.rsync-ssh-key.file = ../secrets/rsync-ssh-nas.age;
-
   environment.systemPackages = with pkgs; [
+    ffmpeg
+    imagemagick
+    makemkv
     mkvtoolnix-cli
   ];
 
+  services.samba = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+      global = {
+        security = "user";
+        workgroup = "WORKGROUP";
+        "server string" = config.networking.hostName;
+        "netbios name" = config.networking.hostName;
+        "hosts allow" = "192.168.1.0/24 10.100.0.0/24 localhost";
+        "guest account" = "nobody";
+        "map to guest" = "bad user";
+        "use sendfile" = true;
+        "load printers" = false;
+        "vfs objects" = "fruit streams_xattr";
+        "fruit:metadata" = "stream";
+        "mangled names" = false;
+      };
+      media = {
+        path = "/data/media";
+        browseable = "yes";
+        "read only" = "yes";
+        "guest ok" = "yes";
+      };
+    };
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
   systemd.timers = pkgs.lib.listToAttrs (
     map (job: {
       name = "rsync-backup-${job.name}";