chore: cleanups

systems/etna/immich.nix

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

systems/etna/metrics.nix

@@ -24,7 +24,8 @@ in
     };
   };
 
-  services.grafana = {
+  services = {
+    grafana = {
       enable = true;
       settings = {
         server = {
@@ -34,13 +35,13 @@ in
       };
     };
 
-  services.victoriametrics = {
+    victoriametrics = {
       enable = true;
       listenAddress = "127.0.0.1:9090";
       retentionPeriod = "5y";
     };
 
-  services.vmagent = {
+    vmagent = {
       enable = true;
       prometheusConfig = {
         global.scrape_interval = "15s";
@@ -60,7 +61,7 @@ in
       };
     };
 
-  services.vmauth = {
+    vmauth = {
       enable = true;
       listenAddress = "127.0.0.1:9089";
       environmentFile = vmauthEnv.path;
@@ -71,4 +72,5 @@ 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,60 +1,17 @@
+{ pkgs, ... }:
 {
-  pkgs,
+  imports = [
-  config,
+    ./frp.nix
-  _utils,
+    ./hetzner.nix
-  ...
+  ];
-}:
-let
-  secrets = _utils.setupSharedSecrets config { secrets = [ "frpToken" ]; };
-in
-{
-  imports = [ secrets.generate ];
-
-  zramSwap.enable = true;
 
   environment.systemPackages = with pkgs; [
     dig
     traceroute
   ];
 
-  services = {
+  services.openssh = {
-    openssh.ports = [ 4269 ];
+    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

@@ -0,0 +1,31 @@
+{ 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

@@ -0,0 +1,18 @@
+{ 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;
+}