Refactor meta.{domains,ports}

.sops.yaml

@@ -1,5 +1,5 @@
 # This is a placeholder.
 # The real .sops.yaml is generated via: nix build .#sops-config
-# See ./flake/sops.nix for details.
+# See flake/sops.nix for details.
 
 creation_rules: []

hosts/srv-external/default.nix

@@ -68,7 +68,7 @@
         openspeedtest = {
           inherit (config.custom.services.openspeedtest) domain port;
           tls = false;
-          
+
           extraReverseProxyConfig = ''
             request_buffers 35MiB
             response_buffers 35MiB

modules/system/meta/domains.nix

@@ -33,20 +33,21 @@ in
           |> lib.concatLists
           |> lib.concatMap (
             entry:
-            lib.map (domain: {
+            entry.value
-              file = entry.file;
+            |> lib.map (domain: {
+              file = entry.file |> lib.removePrefix "${self}/";
               inherit domain;
-            }) entry.value
+            })
           )
           |> lib.groupBy (entry: builtins.toString entry.domain)
-          |> lib.filterAttrs (domain: entries: lib.length entries > 1);
+          |> lib.filterAttrs (_: entries: lib.length entries > 1);
 
         errorMessage =
           duplicateDomains
           |> lib.mapAttrsToList (
             domain: entries:
             "Duplicate domain \"${domain}\" found in:\n"
-            + lib.concatMapStrings (entry: "  - ${entry.file}\n") entries
+            + (entries |> lib.map (entry: "  - ${entry.file}") |> lib.concatLines)
           )
           |> lib.concatStrings;
       in

modules/system/meta/ports.nix

@@ -1,6 +1,7 @@
 {
   config,
   options,
+  self,
   lib,
   ...
 }:
@@ -23,19 +24,21 @@ in
           options.meta.ports.list.definitionsWithLocations
           |> lib.concatMap (
             entry:
-            lib.map (port: {
+            entry.value
-              inherit (entry) file;
+            |> lib.map (port: {
+              file = entry.file |> lib.removePrefix "${self}/";
               inherit port;
-            }) entry.value
+            })
           )
           |> lib.groupBy (entry: builtins.toString entry.port)
-          |> lib.filterAttrs (port: entries: lib.length entries > 1);
+          |> lib.filterAttrs (_: entries: lib.length entries > 1);
 
         errorMessage =
           duplicatePorts
           |> lib.mapAttrsToList (
             port: entries:
-            "Duplicate port ${port} found in:\n" + lib.concatMapStrings (entry: "  - ${entry.file}\n") entries
+            "Duplicate port ${port} found in:\n"
+            + (entries |> lib.map (entry: "  - ${entry.file}") |> lib.concatLines)
           )
           |> lib.concatStrings;
       in