From 373e2dd38646ecad2078bcfe91d71f6702ccc838 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Tue, 31 Dec 2024 16:08:29 +0100
Subject: [PATCH] chore: cleanups

---
 systems/etna/immich.nix      |  1 -
 systems/etna/metrics.nix     | 76 ++++++++++++++++++------------------
 systems/fuji-wsl/default.nix |  2 +-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/systems/etna/immich.nix b/systems/etna/immich.nix
index 65b520b..f355dd6 100644
--- a/systems/etna/immich.nix
+++ b/systems/etna/immich.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   services.immich = {
     enable = true;
diff --git a/systems/etna/metrics.nix b/systems/etna/metrics.nix
index 186747b..a79c11a 100644
--- a/systems/etna/metrics.nix
+++ b/systems/etna/metrics.nix
@@ -24,51 +24,53 @@ in
     };
   };
 
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        http_port = 2432;
-        root_url = "https://grafana.uku3lig.net";
+  services = {
+    grafana = {
+      enable = true;
+      settings = {
+        server = {
+          http_port = 2432;
+          root_url = "https://grafana.uku3lig.net";
+        };
       };
     };
-  };
 
-  services.victoriametrics = {
-    enable = true;
-    listenAddress = "127.0.0.1:9090";
-    retentionPeriod = "5y";
-  };
+    victoriametrics = {
+      enable = true;
+      listenAddress = "127.0.0.1:9090";
+      retentionPeriod = "5y";
+    };
 
-  services.vmagent = {
-    enable = true;
-    prometheusConfig = {
-      global.scrape_interval = "15s";
+    vmagent = {
+      enable = true;
+      prometheusConfig = {
+        global.scrape_interval = "15s";
 
-      # node scraping is sent to vm directly via vmauth
-      scrape_configs = [
+        # node scraping is sent to vm directly via vmauth
+        scrape_configs = [
+          {
+            job_name = "victoriametrics";
+            static_configs = [ { targets = [ "${builtins.toString vmcfg.listenAddress}" ]; } ];
+          }
+
+          {
+            job_name = "api-rs";
+            static_configs = [ { targets = [ "localhost:5001" ]; } ];
+          }
+        ];
+      };
+    };
+
+    vmauth = {
+      enable = true;
+      listenAddress = "127.0.0.1:9089";
+      environmentFile = vmauthEnv.path;
+      authConfig.users = [
         {
-          job_name = "victoriametrics";
-          static_configs = [ { targets = [ "${builtins.toString vmcfg.listenAddress}" ]; } ];
-        }
-
-        {
-          job_name = "api-rs";
-          static_configs = [ { targets = [ "localhost:5001" ]; } ];
+          bearer_token = "%{VM_AUTH_TOKEN}";
+          url_prefix = "http://${vmcfg.listenAddress}";
         }
       ];
     };
   };
-
-  services.vmauth = {
-    enable = true;
-    listenAddress = "127.0.0.1:9089";
-    environmentFile = vmauthEnv.path;
-    authConfig.users = [
-      {
-        bearer_token = "%{VM_AUTH_TOKEN}";
-        url_prefix = "http://${vmcfg.listenAddress}";
-      }
-    ];
-  };
 }
diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix
index 566f739..f2caa0c 100644
--- a/systems/fuji-wsl/default.nix
+++ b/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; };
       }
     ];
   };