fix(*): adapt to nixos-24.05 changes

nix/os/containers/mailserver.nix

@@ -1,15 +1,17 @@
 {
-  repoFlake,
+  specialArgs,
   hostAddress,
   localAddress,
   imapsPort ? 993,
   sievePort ? 4190,
   autoStart ? false,
 }: {
+  inherit specialArgs;
   config = {
     pkgs,
     config,
     lib,
+    repoFlake,
     ...
   }: {
     system.stateVersion = "21.11"; # Did you read the comment?
@@ -21,6 +23,12 @@
       ../profiles/common/user.nix
     ];
 
+    networking.firewall.enable = true;
+    networking.firewall.allowedTCPPorts = [
+      imapsPort
+      sievePort
+    ];
+
     # FIXME: find out how to use the `defaultSopsFile` so i don't have to specify each secret separately
     # sops.defaultSopsFile = ./mailserver_secrets.yaml;
 

nix/os/containers/syncthing.nix

@@ -1,10 +1,12 @@
 {
+  specialArgs,
   hostAddress,
   localAddress,
   syncthingPort ? 22000,
   syncthingLocalAnnouncePort ? 21027,
   autoStart ? false,
 }: {
+  inherit specialArgs;
   config = {
     config,
     pkgs,

nix/os/containers/webserver.nix

@@ -1,5 +1,5 @@
 {
-  repoFlake,
+  specialArgs,
   hostAddress,
   localAddress,
   httpPort ? 80,
@@ -8,10 +8,12 @@
 }: let
   domain = "www.stefanjunker.de";
 in {
+  inherit specialArgs;
   config = {
     config,
     pkgs,
     lib,
+    repoFlake,
     ...
   }: {
     system.stateVersion = "22.05"; # Did you read the comment?
@@ -22,7 +24,11 @@ in {
       repoFlake.inputs.sops-nix.nixosModules.sops
     ];
 
-    networking.firewall.enable = false;
+    networking.firewall.enable = true;
+    networking.firewall.allowedTCPPorts = [
+      httpPort
+      httpsPort
+    ];
 
     sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
     sops.secrets.hedgedoc_environment_file = {