[nix,flake] Moves some container files around. Also updates the flake lock. [synapse] Gets the federation working

system/hosts/mcp/containers.nix

@@ -3,6 +3,9 @@
 {
   # Additional configuration
   imports = [
+    ./containers/havenisms.com
+    ./containers/blazestar.net
+
     # Docker containers
     ./containers/dm-companion.nix
     ./containers/freshrss.nix
@@ -19,7 +22,6 @@
     ./containers/public-homepage.nix
     ./containers/searxng.nix
     ./containers/shared-postgres.nix
-    ./containers/synapse.nix
     ./containers/timetagger.nix
     ./containers/traefik.nix
     ./containers/users.nix
@@ -31,6 +33,13 @@
   # Enable common container config files in /etc/containers
   virtualisation.containers.enable = true;
   virtualisation = {
+    # docker = {
+    #   enable = true;
+    #   # Enable rootless so that I can run containers as other users for security.
+    #   rootless = {
+    #     enable = true;
+    #   };
+    # };
     podman = {
       enable = true;
 
@@ -43,6 +52,7 @@
       extraPackages = [ pkgs.zfs ];
     };
   };
+  virtualisation.oci-containers.backend = "podman";
 
   # Useful other development tools
   environment.systemPackages = with pkgs; [
@@ -52,11 +62,9 @@
     #podman-compose # start group of containers for dev
   ];
 
-  virtualisation.oci-containers.backend = "podman";
   virtualisation.oci-containers.containers =
     let
       inherit (import ./containers/lib.nix config)
-        hostRuleHavenisms
         localHostRuleHavenisms
         havenisms
         ;