systems/etna/immich.nix

@@ -1,3 +1,4 @@
+{ ... }:
 {
   services.immich = {
     enable = true;

systems/etna/metrics.nix

@@ -24,8 +24,7 @@ in
     };
   };
 
-  services = {
+  services.grafana = {
-    grafana = {
     enable = true;
     settings = {
       server = {
@@ -35,13 +34,13 @@ in
     };
   };
 
-    victoriametrics = {
+  services.victoriametrics = {
     enable = true;
     listenAddress = "127.0.0.1:9090";
     retentionPeriod = "5y";
   };
 
-    vmagent = {
+  services.vmagent = {
     enable = true;
     prometheusConfig = {
       global.scrape_interval = "15s";
@@ -61,7 +60,7 @@ in
     };
   };
 
-    vmauth = {
+  services.vmauth = {
     enable = true;
     listenAddress = "127.0.0.1:9089";
     environmentFile = vmauthEnv.path;
@@ -72,5 +71,4 @@ in
       }
     ];
   };
-  };
 }

systems/fuji-wsl/default.nix

@@ -43,7 +43,7 @@
     replacements = [
       {
         oldDependency = pkgs.ffmpeg-full;
-        newDependency = pkgs.ffmpeg-full.override { withUnfree = true; };
+        newDependency = (pkgs.ffmpeg-full.override { withUnfree = true; });
       }
     ];
   };

systems/vesuvio/default.nix

@@ -1,17 +1,60 @@
-{ pkgs, ... }:
 {
-  imports = [
+  pkgs,
-    ./frp.nix
+  config,
-    ./hetzner.nix
+  _utils,
-  ];
+  ...
+}:
+let
+  secrets = _utils.setupSharedSecrets config { secrets = [ "frpToken" ]; };
+in
+{
+  imports = [ secrets.generate ];
+
+  zramSwap.enable = true;
 
   environment.systemPackages = with pkgs; [
     dig
     traceroute
   ];
 
-  services.openssh = {
+  services = {
-    ports = [ 4269 ];
+    openssh.ports = [ 4269 ];
-    openFirewall = true;
+
+    # Needed by the Hetzner Cloud password reset feature.
+    qemuGuest.enable = true;
+
+    resolved = {
+      dnssec = "allow-downgrade";
+      dnsovertls = "false";
+    };
+
+    frp = {
+      enable = true;
+      role = "server";
+      settings = {
+        bindPort = 7000;
+        auth = {
+          method = "token";
+          token = "{{ .Envs.FRP_TOKEN }}";
+        };
+      };
+    };
+  };
+
+  systemd.services = {
+    frp.serviceConfig.EnvironmentFile = secrets.get "frpToken";
+
+    # https://discourse.nixos.org/t/qemu-guest-agent-on-hetzner-cloud-doesnt-work/8864/2
+    qemu-guest-agent.path = [ pkgs.shadow ];
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [ 22 ]; # forgejo-ssh
+    allowedTCPPortRanges = [
+      {
+        from = 6000;
+        to = 7000;
+      }
+    ];
   };
 }

systems/vesuvio/frp.nix

@@ -1,31 +0,0 @@
-{ config, _utils, ... }:
-let
-  secrets = _utils.setupSharedSecrets config { secrets = [ "frpToken" ]; };
-in
-{
-  imports = [ secrets.generate ];
-
-  services.frp = {
-    enable = true;
-    role = "server";
-    settings = {
-      bindPort = 7000;
-      auth = {
-        method = "token";
-        token = "{{ .Envs.FRP_TOKEN }}";
-      };
-    };
-  };
-
-  networking.firewall = {
-    allowedTCPPorts = [ 22 ]; # forgejo-ssh
-    allowedTCPPortRanges = [
-      {
-        from = 6000;
-        to = 7000;
-      }
-    ];
-  };
-
-  systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken";
-}

systems/vesuvio/hetzner.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    # Needed by the Hetzner Cloud password reset feature.
-    qemuGuest.enable = true;
-
-    # Hetzner DNS does not work with DoT
-    resolved = {
-      dnssec = "allow-downgrade";
-      dnsovertls = "false";
-    };
-  };
-
-  # https://discourse.nixos.org/t/qemu-guest-agent-on-hetzner-cloud-doesnt-work/8864/2
-  systemd.services.qemu-guest-agent.path = [ pkgs.shadow ];
-
-  zramSwap.enable = true;
-}