containers: rename sevices to arion-*

Signed-off-by: Myned <dev@bjork.tech>

options/custom/containers/actualbudget.nix

@@ -12,10 +12,7 @@ in {
     #?? arion-actualbudget pull
     environment.shellAliases.arion-actualbudget = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.actualbudget.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.actualbudget = {
+    virtualisation.arion.projects.actualbudget.settings.services = {
-      serviceName = "actualbudget";
-
-      settings.services = {
       actualbudget.service = {
         container_name = "actualbudget";
         image = "actualbudget/actual-server:24.9.0";
@@ -26,5 +23,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/coturn.nix

@@ -21,10 +21,7 @@ in {
     #?? arion-coturn pull
     environment.shellAliases.arion-coturn = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.coturn.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.coturn = {
+    virtualisation.arion.projects.coturn.settings.services = {
-      serviceName = "coturn";
-
-      settings.services = {
       # https://conduwuit.puppyirl.gay/turn.html
       coturn.service = {
         container_name = "coturn";
@@ -37,7 +34,6 @@ in {
         ];
       };
     };
-    };
 
     # TODO: Use nobody:nogroup instead when docker allows changing mount ownership
     # HACK: Copy with global read-only permissions in container directory which is assumed to be locked down

options/custom/containers/forgejo.nix

@@ -24,10 +24,7 @@ in {
 
     networking.firewall.allowedTCPPorts = [22]; # SSH
 
-    virtualisation.arion.projects.forgejo = {
+    virtualisation.arion.projects.forgejo.settings.services = {
-      serviceName = "forgejo";
-
-      settings.services = {
       # https://codeberg.org/forgejo/forgejo
       # https://forgejo.org/docs/latest/admin/
       #?? docker exec -it forgejo bash
@@ -55,5 +52,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/foundryvtt.nix

@@ -21,10 +21,7 @@ in {
     #?? arion-foundryvtt pull
     environment.shellAliases.arion-foundryvtt = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.foundryvtt.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.foundryvtt = {
+    virtualisation.arion.projects.foundryvtt.settings.services = {
-      serviceName = "foundryvtt";
-
-      settings.services = {
       foundryvtt.service = {
         container_name = "foundryvtt";
         env_file = [config.age.secrets."${config.custom.profile}/foundryvtt/.env".path];
@@ -35,5 +32,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/headscale.nix

@@ -22,10 +22,7 @@ in {
     #?? arion-headscale pull
     environment.shellAliases.arion-headscale = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.headscale.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.headscale = {
+    virtualisation.arion.projects.headscale.settings.services = {
-      serviceName = "headscale";
-
-      settings.services = {
       # https://headscale.net/
       # https://github.com/juanfont/headscale
       # BUG: Does not support generic DoH/DoT
@@ -57,5 +54,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/homeassistant.nix

@@ -12,10 +12,7 @@ in {
     #?? arion-homeassistant pull
     environment.shellAliases.arion-homeassistant = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.homeassistant.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.homeassistant = {
+    virtualisation.arion.projects.homeassistant.settings.services = {
-      serviceName = "homeassistant";
-
-      settings.services = {
       homeassistant.service = {
         container_name = "homeassistant";
         image = "homeassistant/home-assistant:2024.9.1";
@@ -25,5 +22,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/mastodon.nix

@@ -22,10 +22,7 @@ in {
     #?? arion-mastodon pull
     environment.shellAliases.arion-mastodon = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.mastodon.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.mastodon = {
+    virtualisation.arion.projects.mastodon.settings.services = {
-      serviceName = "mastodon";
-
-      settings.services = {
       # https://github.com/linuxserver/docker-mastodon
       # https://github.com/mastodon/mastodon/blob/main/docker-compose.yml
       mastodon.service = {
@@ -58,5 +55,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/netbox/default.nix

@@ -24,11 +24,8 @@ in {
     environment.shellAliases.arion-netbox = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.netbox.settings.out.dockerComposeYaml}";
 
     # https://github.com/netbox-community/netbox-docker
-    virtualisation.arion.projects.netbox = {
-      serviceName = "netbox";
-
     # https://github.com/netbox-community/netbox-docker/blob/release/docker-compose.yml
-      settings.services = let
+    virtualisation.arion.projects.netbox.settings.services = let
       netbox = {
         container_name = "netbox";
         depends_on = ["cache" "db"];
@@ -82,7 +79,6 @@ in {
         volumes = ["${config.custom.containers.directory}/netbox/db:/var/lib/postgresql/data"];
       };
     };
-    };
 
     #!! Required for correct volume permissions
     systemd.tmpfiles.rules = ["z ${config.custom.containers.directory}/netbox/media 0770 999 root"]; # unit:root

options/custom/containers/nextcloud.nix

@@ -22,10 +22,7 @@ in {
     #?? arion-nextcloud pull
     environment.shellAliases.arion-nextcloud = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.nextcloud.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.nextcloud = {
+    virtualisation.arion.projects.nextcloud.settings.services = {
-      serviceName = "nextcloud";
-
-      settings.services = {
       # https://github.com/nextcloud/docker
       nextcloud.service = {
         container_name = "nextcloud";
@@ -78,5 +75,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/redlib.nix

@@ -12,10 +12,7 @@ in {
     #?? arion-redlib pull
     environment.shellAliases.arion-redlib = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.redlib.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.redlib = {
+    virtualisation.arion.projects.redlib.settings.services = {
-      serviceName = "redlib";
-
-      settings.services = {
       redlib.service = {
         container_name = "redlib";
         image = "quay.io/redlib/redlib:latest";
@@ -32,5 +29,4 @@ in {
       };
     };
   };
-  };
 }

options/custom/containers/searxng/default.nix

@@ -21,10 +21,7 @@ in {
     #?? arion-searxng pull
     environment.shellAliases.arion-searxng = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.searxng.settings.out.dockerComposeYaml}";
 
-    virtualisation.arion.projects.searxng = {
+    virtualisation.arion.projects.searxng.settings.services = {
-      serviceName = "searxng";
-
-      settings.services = {
       # https://github.com/searxng/searxng
       # https://github.com/searxng/searxng-docker
       searxng.service = {
@@ -50,5 +47,4 @@ in {
       };
     };
   };
-  };
 }