adjusted formatting of containers

modules/servers/flame.nix

@@ -9,8 +9,7 @@ in {
   };
   config = lib.mkIf config.my.servers.flame.enable {
     sops.secrets.flame.sopsFile = ../../secrets/env.yaml;
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers = {
-      containers = {
       flame = {
         autoStart = true;
         image = "pawelmalak/flame";
@@ -39,7 +38,6 @@ in {
         };
       };
     };
-    };
     services.nginx = {
       enable = true;
       virtualHosts."start.${config.my.domain}" = proxyReverse port // { };

modules/servers/lidarr.nix

@@ -5,8 +5,7 @@ let
 in {
   options.my.servers.lidarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.lidarr.enable {
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.lidarr = {
-      containers.lidarr = {
       autoStart = true;
       image = "lscr.io/linuxserver/lidarr:latest";
       ports = [ "${toString port}:${toString port}" ];
@@ -30,7 +29,6 @@ in {
         "flame.icon" = "music";
       };
     };
-    };
     services = {
       lidarr.enable = true;
       nginx = {

modules/servers/maloja.nix

@@ -6,8 +6,7 @@ in {
   options.my.servers.maloja.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.maloja.enable {
     sops.secrets.maloja.sopsFile = ../../secrets/env.yaml;
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.maloja = {
-      containers.maloja = {
       image = "krateng/maloja";
       ports = [ "${toString port}:${toString port}" ];
       environmentFiles = [ config.sops.secrets.maloja.path ];
@@ -27,7 +26,6 @@ in {
         "flame.icon" = "bookmark-music";
       };
     };
-    };
     services.nginx = {
       enable = true;
       virtualHosts."${url}" = proxyReverse port // { };

modules/servers/mealie.nix

@@ -7,8 +7,7 @@ in {
   options.my.servers.mealie.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.mealie.enable {
     sops.secrets.mealie.sopsFile = ../../secrets/env.yaml;
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.mealie = {
-      containers.mealie = {
       autoStart = true;
       image = "ghcr.io/mealie-recipes/mealie:v1.4.0";
       ports = [ "${toString port}:9000" ];
@@ -35,7 +34,6 @@ in {
         "flame.icon" = "fridge";
       };
     };
-    };
     services.nginx = {
       enable = true;
       virtualHosts."${domain}" = proxyReverse port // { };

modules/servers/metube.nix

@@ -3,8 +3,7 @@ let port = 8881;
 in {
   options.my.servers.metube.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.metube.enable {
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.metube = {
-      containers.metube = {
       image = "ghcr.io/alexta69/metube";
       ports = [ "${toString port}:8081" ];
       volumes = [
@@ -16,7 +15,6 @@ in {
         YTDL_OPTIONS = ''{"cookiefile":"/cookies.txt"}'';
       };
     };
-    };
     services.nginx = {
       enable = true;
       virtualHosts."bajameesta.${config.my.domain}" = proxyReverse port // { };

modules/servers/multi-scrobbler.nix

@@ -7,8 +7,7 @@ in {
   options.my.servers.multi-scrobbler.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.multi-scrobbler.enable {
     sops.secrets.multi-scrobbler.sopsFile = ../../secrets/env.yaml;
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.multi-scrobbler = {
-      containers.multi-scrobbler = {
       image = "foxxmd/multi-scrobbler";
       ports = [ "${toString port}:${toString port}" ];
       environmentFiles = [ config.sops.secrets.multi-scrobbler.path ];
@@ -17,9 +16,8 @@ in {
         PUID = "1000";
         PGID = "100";
         BASE_URL = url;
-          DEEZER_REDIRECT_URI = "http://${config.my.miniserver-ip}:${
+        DEEZER_REDIRECT_URI =
-              toString port
+          "http://${config.my.miniserver-ip}:${toString port}/deezer/callback";
-            }/deezer/callback";
         MALOJA_URL = "http://maloja:42010";
         WS_ENABLE = "true";
       };
@@ -31,7 +29,6 @@ in {
         "flame.icon" = "broadcast";
       };
     };
-    };
     services.nginx = {
       enable = true;
       virtualHosts."${domain}" = proxyReverse port // { };

modules/servers/nextcloud.nix

@@ -183,8 +183,7 @@ in {
           };
         };
       };
-      virtualisation.oci-containers = {
+      virtualisation.oci-containers.containers = {
-        containers = {
         go-vod = lib.mkIf config.my.servers.go-vod.enable {
           autoStart = true;
           image = "radialapps/go-vod";
@@ -222,7 +221,6 @@ in {
           extraOptions = [ "--cap-add=MKNOD" ];
         };
       };
-      };
       systemd = lib.mkIf config.my.servers.nextcloud.enableCron {
         services = {
           nextcloud-cron.path = [ pkgs.perl ];

modules/servers/prowlarr.nix

@@ -13,12 +13,10 @@
           // { };
       };
     };
-    virtualisation.oci-containers = {
+    virtualisation.oci-containers.containers.flaresolverr = {
-      containers.flaresolverr = {
       autoStart = true;
       image = "ghcr.io/flaresolverr/flaresolverr:latest";
       ports = [ "8191:8191" ];
     };
   };
-  };
 }

modules/servers/ryot.nix

@@ -7,8 +7,7 @@ in {
   config = lib.mkIf
     (config.my.servers.ryot.enable && config.my.servers.postgres.enable) {
       sops.secrets.ryot.sopsFile = ../../secrets/env.yaml;
-      virtualisation.oci-containers = {
+      virtualisation.oci-containers.containers.ryot = {
-        containers.ryot = {
         image = "ghcr.io/ignisda/ryot:latest";
         ports = [ "${toString port}:8000" ];
         environmentFiles = [ config.sops.secrets.ryot.path ];
@@ -18,8 +17,7 @@ in {
           DATABASE_URL = "postgres:///ryot?host=${config.my.postgresSocket}";
           FRONTEND_INSECURE_COOKIES = "true";
         };
-          volumes =
+        volumes = [ "${config.my.postgresSocket}:${config.my.postgresSocket}" ];
-            [ "${config.my.postgresSocket}:${config.my.postgresSocket}" ];
         labels = {
           "flame.type" = "application";
           "flame.name" = "Ryot";
@@ -27,7 +25,6 @@ in {
           "flame.icon" = "radar";
         };
       };
-      };
       services.nginx = {
         enable = true;
         virtualHosts."tracker.${config.my.domain}" = proxyReverse port // { };