Merge pull request 'facts: add bigger migration warnings' (#5484) from fix-c into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5484

nixosModules/clanCore/facts/compat.nix

@@ -164,7 +164,19 @@
   config = lib.mkIf (config.clan.core.secrets != { }) {
     clan.core.facts.services = lib.mapAttrs' (
       name: service:
-      lib.warn "clan.core.secrets.${name} is deprecated, use clan.core.facts.services.${name} instead" (
+      lib.warn
+        ''
+          ###############################################################################
+          #                                                                             #
+          # clan.core.secrets.${name} clan.core.facts.services.${name} is deprecated    #
+          # in favor of "vars"                                                          #
+          #                                                                             #
+          # Refer to https://docs.clan.lol/guides/migrations/migration-facts-vars/      #
+          # for migration instructions.                                                 #
+          #                                                                             #
+          ###############################################################################
+        ''
+        (
           lib.nameValuePair name ({
             secret = service.secrets;
             public = service.facts;

nixosModules/clanCore/facts/default.nix

@@ -6,7 +6,17 @@
 }:
 {
   config.warnings = lib.optionals (config.clan.core.facts.services != { }) [
-    "Facts are deprecated, please migrate them to vars instead, see: https://docs.clan.lol/guides/migrations/migration-facts-vars/"
+    ''
+      ###############################################################################
+      #                                                                             #
+      # Facts are deprecated please migrate any usages to vars instead              #
+      #                                                                             #
+      #                                                                             #
+      # Refer to https://docs.clan.lol/guides/migrations/migration-facts-vars/      #
+      # for migration instructions.                                                 #
+      #                                                                             #
+      ###############################################################################
+    ''
   ];
 
   options.clan.core.facts = {

nixosModules/clanCore/vars/secret/sops/collectFiles.nix

@@ -5,18 +5,16 @@
 let
   inherit (lib)
     filterAttrs
-    flatten
     mapAttrsToList
     ;
-in
-generators:
-let
-  relevantFiles =
-    generator:
-    filterAttrs (
+
+  relevantFiles = filterAttrs (
     _name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services")
-    ) generator.files;
-  allFiles = flatten (
+  );
+
+  collectFiles =
+    generators:
+    builtins.concatLists (
       mapAttrsToList (
         gen_name: generator:
         mapAttrsToList (fname: file: {
@@ -30,8 +28,8 @@ let
             mode
             restartUnits
             ;
-      }) (relevantFiles generator)
+        }) (relevantFiles generator.files)
       ) generators
     );
 in
-allFiles
+collectFiles