Clean up

configuration.nix

@@ -11,27 +11,7 @@
     ./drives.nix
     ./games/palworld.nix
     ./games/minecraft
-    ./services/mautrix.nix
-    ./services/jellyfin.nix
-    ./services/mastodon.nix
-    ./services/archivebox.nix
-    ./services/cross-seed.nix
-    ./services/forgejo.nix
-    ./services/wakapi.nix
-    ./services/blocky.nix
-    ./services/coturn.nix
-    ./services/feishin.nix
-    ./services/ntfy.nix
-    ./services/nextcloud.nix
-    ./services/unpackerr.nix
-    ./services/qbittorrent.nix
-    ./services/grafana.nix
-    ./services/pds
-    ./services/gonic.nix
-    ./services/youtuee.nix
-    ./services/confess.nix
-    ./services/lastfm-status.nix
-    ./services/rr.nix
+    ./services
     inputs.common-modules.nixosModules.nixos-upgrade
   ];
 

services/archivebox.nix

@@ -1,8 +1,4 @@
-{ settings
-, lib
-, pkgs
-, ...
-}:
+{ settings, lib, pkgs, ... }:
 let
   dockerNetwork = "archivebox";
 
@@ -53,6 +49,8 @@ let
       };
     };
   };
+
+  port = 4009;
 in
 {
   system.activationScripts.archivebox-docker-network = ''
@@ -64,7 +62,7 @@ in
       autoStart = true;
       image = "docker.io/archivebox/archivebox:0.7.3";
       ports = [
-        "${toString settings.ports.archivebox}:8000"
+        "${toString port}:8000"
       ];
       environment = {
         SEARCH_BACKEND_ENGINE = "sonic";
@@ -100,6 +98,6 @@ in
 
   services.caddy.virtualHosts."http://archive.internal".extraConfig = ''
     @local remote_ip private_ranges 100.64.0.0/10
-    reverse_proxy @local :${toString settings.ports.archivebox}
+    reverse_proxy @local :${toString port}
   '';
 }

services/default.nix

@@ -0,0 +1,25 @@
+{ ... }: {
+  imports = [
+    ./mautrix.nix
+    ./jellyfin.nix
+    ./mastodon.nix
+    ./archivebox.nix
+    ./cross-seed.nix
+    ./forgejo.nix
+    ./wakapi.nix
+    ./blocky.nix
+    ./coturn.nix
+    ./feishin.nix
+    ./ntfy.nix
+    ./nextcloud.nix
+    ./unpackerr.nix
+    ./qbittorrent.nix
+    ./grafana.nix
+    ./pds
+    ./gonic.nix
+    ./youtuee.nix
+    ./confess.nix
+    ./lastfm-status.nix
+    ./rr.nix
+  ];
+}

services/feishin.nix

@@ -1,4 +1,8 @@
-{ config, settings, ... }: {
+{ ... }:
+let
+  port = 9180;
+in
+{
   virtualisation.oci-containers.containers.feishin = {
     autoStart = true;
     image = "ghcr.io/jeffvli/feishin:latest";
@@ -14,7 +18,7 @@
       TZ = "Europe/Tallinn";
     };
     ports = [
-      "${toString settings.ports.feishin}:9180"
+      "${toString port}:9180"
     ];
   };
 
@@ -24,6 +28,6 @@
       resolvers 1.1.1.1
     }
 
-    reverse_proxy :${toString settings.ports.feishin}
+    reverse_proxy :${toString port}
   '';
 }

services/jellyfin.nix

@@ -1,9 +1,16 @@
-{ config, settings, ... }: {
+{ ... }:
+let
+  ports = {
+    jellyfin = 8096;
+    jellyfin_vue = 4004;
+  };
+in
+{
   virtualisation.oci-containers.containers.jellyfin-vue = {
     autoStart = true;
     image = "docker.io/jellyfin/jellyfin-vue:unstable";
     ports = [
-      "${toString settings.ports.jellyfin_vue}:80"
+      "${toString ports.jellyfin_vue}:80"
     ];
   };
 
@@ -40,7 +47,7 @@
           resolvers 1.1.1.1
         }
 
-        reverse_proxy :${toString settings.ports.jellyfin_vue}
+        reverse_proxy :${toString ports.jellyfin_vue}
       '';
       "jellyfin.catnip.ee".extraConfig = ''
         tls {
@@ -48,7 +55,7 @@
           resolvers 1.1.1.1
         }
 
-        reverse_proxy :${toString settings.ports.jellyfin}
+        reverse_proxy :${toString ports.jellyfin}
       '';
     };
 

services/mautrix.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, settings, ... }: {
+{ pkgs, settings, ... }: {
   virtualisation.oci-containers.containers.mautrix-discord = {
     autoStart = true;
     image = "dock.mau.dev/mautrix/discord:v0.7.2";

services/nextcloud.nix

@@ -1,4 +1,6 @@
-{ settings, config, pkgs, ... }: {
+{ config, pkgs, ... }: let
+  port = 4008;
+in {
   environment.systemPackages = with pkgs; [
     ffmpeg # needed for thumbnails iirc
   ];
@@ -22,7 +24,7 @@
          Referrer-Policy no-referrer-when-downgrade
        }
 
-       reverse_proxy 127.0.0.1:${toString settings.ports.nextcloud}
+       reverse_proxy 127.0.0.1:${toString port}
     '';
 
     # /var/lib/nextcloud
@@ -88,7 +90,7 @@
       listen = [
         {
           addr = "127.0.0.1";
-          port = settings.ports.nextcloud;
+          inherit port;
         }
       ];
     };

settings.nix

@@ -10,10 +10,5 @@
     epicgames-freegames-node = 4018;
     qbittorrent-torrent = 43125;
     qbittorrent = 4010;
-    archivebox = 4009;
-    nextcloud = 4008;
-    jellyfin_vue = 4004;
-    jellyfin = 8096;
-    feishin = 9180;
   };
 }