chore(etna): move some stuff in default.nix

systems/etna/default.nix

@@ -38,6 +38,17 @@ in {
   services = {
     openssh.openFirewall = true;
 
+    nginx.enable = true;
+
+    frp = {
+      enable = true;
+      role = "client";
+      settings = {
+        serverAddr = "49.13.148.129";
+        serverPort = 7000;
+      };
+    };
+
     cloudflared = {
       enable = true;
       tunnels.${tunnelId} = {

systems/etna/dendrite.nix

@@ -59,10 +59,7 @@
       ];
     };
 
-    nginx = {
-      enable = true;
-
-      virtualHosts."m.uku.moe".locations = let
+    nginx.virtualHosts."m.uku.moe".locations = let
       server = {"m.server" = "m.uku.moe:443";};
       client = {"m.homeserver"."base_url" = "https://m.uku.moe";};
     in {
@@ -86,5 +83,4 @@
       };
     };
   };
-  };
 }

systems/etna/minecraft.nix

@@ -63,15 +63,6 @@ in
   lib.recursiveUpdate {
     age.secrets = mkSecret "minecraftEnv" {};
 
-    services.frp = {
-      enable = true;
-      role = "client";
-      settings = {
-        serverAddr = "49.13.148.129";
-        serverPort = 7000;
-      };
-    };
-
     virtualisation.oci-containers.backend = "docker";
 
     systemd.services.restart-minecraft-servers = {