refactor: Bring arm back, and just use arm on macos

Now that we have arm builds for most of the software

Author: edmundmiller

nextflow.config

@@ -181,7 +181,7 @@ profiles {
         apptainer.enabled       = false
     }
     docker {
-        includeConfig 'conf/containers/containers_docker_amd64.config'
+        // includeConfig 'conf/containers/containers_docker_amd64.config'
         docker.enabled          = true
         conda.enabled           = false
         singularity.enabled     = false
@@ -259,8 +259,16 @@ profiles {
         }
     }
     // ARM Related Profiles
-    apple {
-        docker.runOptions       = '-u $(id -u):$(id -g) --platform=linux/amd64'
+    arm {
+        process.arch            = 'arm64'
+        // TODO https://github.com/nf-core/modules/issues/6694
+        // For now if you're using arm64 you have to use wave for the sake of the maintainers
+        // wave profile
+        apptainer.ociAutoPull   = true
+        singularity.ociAutoPull = true
+        wave.enabled            = true
+        wave.freeze             = true
+        wave.strategy           = 'conda,container'
     }
     docker_arm {
         includeConfig 'conf/containers/containers_docker_arm64.config'