refactoring

flake.nix

@@ -2,8 +2,8 @@
   description = "Flake for server muffin";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    # nixpkgs.url = "github:NixOS/nixpkgs/master";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
@@ -21,7 +21,7 @@
       nix-minecraft,
       nixos-hardware,
       ...
-    }:
+    }@inputs:
     let
       username = "primary";
       hostname = "muffin";
@@ -34,11 +34,8 @@
         # TODO: add checks to make sure none of these collide
         ports = {
           https = 443;
-          immich = 3001;
-          jellyfin = 8096;
+          jellyfin = 8096; # no services.jellyfin option for this
           torrent = 6011;
-          minecraft = 25565;
-          gitea = 3281;
           ollama = 11434;
         };
 
@@ -75,8 +72,7 @@
         };
 
         jellyfin = {
-          data_dir = service_configs.services_dir + "/jellyfin";
-          cache_dir = service_configs.services_dir + "/jellyfin_cache";
+          dir = service_configs.services_dir + "/jellyfin";
         };
 
         ollama = {
@@ -92,6 +88,7 @@
             hostname
             eth_interface
             service_configs
+            inputs
             ;
         };
         modules = [