diff --git a/configuration.nix b/configuration.nix
index d3f2f16..db91d8f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,11 +19,13 @@
     ./services/immich.nix
     ./services/gitea.nix
     ./services/minecraft.nix
+
     ./services/wg.nix
     ./services/qbittorrent.nix
     ./services/bitmagnet.nix
-    ./services/matrix.nix
-    ./services/owntracks.nix
+
+    # ./services/matrix.nix
+    # ./services/owntracks.nix
     ./services/soulseek.nix
   ];
 
@@ -98,7 +100,10 @@
   services.openssh = {
     enable = true;
     settings = {
-      AllowUsers = [ username "root" ];
+      AllowUsers = [
+        username
+        "root"
+      ];
       PasswordAuthentication = false;
       PermitRootLogin = "yes"; # for deploying configs
     };
@@ -288,7 +293,8 @@
     ];
   };
 
-  users.users.root.openssh.authorizedKeys.keys = config.users.users.${username}.openssh.authorizedKeys.keys;
+  users.users.root.openssh.authorizedKeys.keys =
+    config.users.users.${username}.openssh.authorizedKeys.keys;
 
   # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell
   programs.fish.enable = true;
diff --git a/flake.lock b/flake.lock
index c6ae6d5..a706e0a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742234739,
-        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
+        "lastModified": 1742655702,
+        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
+        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742522051,
-        "narHash": "sha256-uDlj+5J7eTuFkDaNl9cYf++gJdEW23Z4zSuDcNANIQc=",
+        "lastModified": 1742608263,
+        "narHash": "sha256-NMd7fpj04y0srAbHa19o7xMk19MzIrwkOKz57mxJC5E=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "57464e795fd31ceef845d7ce454d3b83e80e283e",
+        "rev": "341dc497af2d985ec97a9b5c935674b885706e52",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1742376361,
-        "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=",
+        "lastModified": 1742631601,
+        "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9",
+        "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742562948,
-        "narHash": "sha256-QUnzAW7CW0sCkFN1Kez/8UVq8EbBGNKOfHZHIZON0XQ=",
+        "lastModified": 1742596159,
+        "narHash": "sha256-SH9ein8zlFHD1xk/se3OXE3ZuxGHNyY8DlVb0fFj/bg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7a04ccc42104e0554f0a2325930fe98db9a5325",
+        "rev": "904178ac5c12ff07a359fbb20453a977f0b7effd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3113d0e..2d4765f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,6 +86,7 @@
 
         postgres = {
           socket = "/run/postgresql";
+          dataDir = "${service_configs.services_dir}/sql";
         };
 
         immich = {
@@ -103,7 +104,8 @@
         };
 
         jellyfin = {
-          dir = services_dir + "/jellyfin";
+          dataDir = services_dir + "/jellyfin";
+          cacheDir = services_dir + "/jellyfin_cache";
         };
 
         owntracks = {
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 0e4b23c..911f4fd 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -12,13 +12,13 @@
     jellyfin-ffmpeg
   ];
 
-  services.jellyfin = rec {
+  services.jellyfin = {
     enable = true;
     # used for local streaming
     openFirewall = true;
 
-    dataDir = service_configs.jellyfin.dir;
-    cacheDir = dataDir + "_cache";
+    dataDir = service_configs.jellyfin.dataDir;
+    cacheDir = service_configs.jellyfin.cacheDir;
   };
 
   services.caddy.virtualHosts."jellyfin.${service_configs.https.domain}".extraConfig = ''
diff --git a/services/postgresql.nix b/services/postgresql.nix
index afd552e..9bf429b 100644
--- a/services/postgresql.nix
+++ b/services/postgresql.nix
@@ -2,13 +2,14 @@
   pkgs,
   config,
   username,
+  service_configs,
   ...
 }:
 {
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_16;
-    dataDir = "/tank/services/sql";
+    dataDir = service_configs.postgres.dataDir;
   };
 
   systemd.tmpfiles.rules = [