organize

configuration.nix

@@ -23,8 +23,8 @@
     ./modules/power.nix
 
     ./services/postgresql.nix
-    ./services/jellyfin.nix
-    ./services/caddy.nix
+    ./services/jellyfin
+    ./services/caddy
     ./services/immich.nix
     ./services/gitea.nix
     ./services/gitea-actions-runner.nix
@@ -32,7 +32,6 @@
 
     ./services/wg.nix
     ./services/qbittorrent.nix
-    ./services/jellyfin-qbittorrent-monitor.nix
     ./services/bitmagnet.nix
 
     ./services/arr/prowlarr.nix
@@ -47,7 +46,7 @@
 
     ./services/soulseek.nix
 
-    ./services/llama-cpp.nix
+    ./services/llama-cpp
     ./services/trilium.nix
 
     ./services/ups.nix
@@ -65,19 +64,13 @@
     ./services/p2pool.nix
     ./services/xmrig.nix
 
-    ./services/llama-cpp-xmrig-pause.nix
-
-    # KEEP UNTIL 2028
-    ./services/caddy_senior_project.nix
-
     ./services/graphing-calculator.nix
 
     ./services/ssh.nix
 
     ./services/syncthing.nix
 
-    ./services/ntfy.nix
-    ./services/ntfy-alerts.nix
+    ./services/ntfy
 
     ./services/mollysocket.nix
   ];

services/caddy/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./caddy.nix
+    # KEEP UNTIL 2028
+    ./caddy_senior_project.nix
+  ];
+}

services/jellyfin/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./jellyfin.nix
+    ./jellyfin-qbittorrent-monitor.nix
+  ];
+}

services/jellyfin/jellyfin-qbittorrent-monitor.nix

@@ -2,9 +2,10 @@
   pkgs,
   service_configs,
   config,
+  lib,
   ...
 }:
-{
+lib.mkIf config.services.jellyfin.enable {
   systemd.services."jellyfin-qbittorrent-monitor" = {
     description = "Monitor Jellyfin streaming and control qBittorrent rate limits";
     after = [

services/llama-cpp/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./llama-cpp.nix
+    ./llama-cpp-xmrig-pause.nix
+  ];
+}

services/llama-cpp/llama-cpp-xmrig-pause.nix

@@ -1,8 +1,10 @@
 {
+  config,
+  lib,
   pkgs,
   ...
 }:
-{
+lib.mkIf config.services.llama-cpp.enable {
   systemd.services.llama-cpp-xmrig-pause = {
     description = "Pause xmrig while llama-cpp is processing requests";
     after = [

services/ntfy/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./ntfy.nix
+    ./ntfy-alerts.nix
+  ];
+}

services/ntfy/ntfy-alerts.nix

@@ -1,5 +1,10 @@
-{ config, service_configs, ... }:
 {
+  config,
+  lib,
+  service_configs,
+  ...
+}:
+lib.mkIf config.services.ntfy-sh.enable {
   services.ntfyAlerts = {
     enable = true;
     serverUrl = "https://${service_configs.ntfy.domain}";

tests/fail2ban-jellyfin.nix

@@ -30,7 +30,7 @@ let
     { config, pkgs, ... }:
     {
       imports = [
-        (import ../services/jellyfin.nix {
+        (import ../services/jellyfin/jellyfin.nix {
           inherit config pkgs;
           lib = testLib;
           service_configs = testServiceConfigs;

tests/jellyfin-qbittorrent-monitor.nix

@@ -137,7 +137,7 @@ pkgs.testers.runNixOSTest {
 
     with subtest("Start monitor service"):
         python = "${pkgs.python3.withPackages (ps: [ ps.requests ])}/bin/python"
-        monitor = "${../services/jellyfin-qbittorrent-monitor.py}"
+        monitor = "${../services/jellyfin/jellyfin-qbittorrent-monitor.py}"
         server.succeed(f"""
           systemd-run --unit=monitor-test \
             --setenv=JELLYFIN_URL=http://localhost:8096 \

tests/llama-cpp-xmrig-pause.nix

@@ -3,7 +3,7 @@
   ...
 }:
 let
-  script = ../services/llama-cpp-xmrig-pause.py;
+  script = ../services/llama-cpp/llama-cpp-xmrig-pause.py;
   python = pkgs.python3;
 
   # SmolLM-135M Q2_K: 85MB, modern GGUFv3, generates ~30 tok/s on one CPU