Alias services.prometheus.exporters.endlessh-go to services.endlessh-go.prometheus and make allowUnfree global

modules/discord.nix

@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }: with lib; merge
 
-(desktopSystemConfiguration {
-  nixpkgs.config.allowUnfree = true;
-})
-
 (desktopUserHomeConfiguration {
   xdg.configFile."Vencord/settings/quickCss.css".text = config.theme.discordCss;
 })

modules/endlessh-go.nix

@@ -4,20 +4,25 @@ let
   fakeSSHPort    = 22;
   prometheusPort = 9050;
 in serverSystemConfiguration {
-  services.prometheus.scrapeConfigs = [{
-    job_name = "endlessh-go";
+  services.prometheus = {
+    exporters.endlessh-go = enabled {
+      listenAddress = "[::1]";
+      port          = prometheusPort;
+    };
 
-    static_configs = [{
-      labels.job = "endlessh-go";
-      targets    = [
-        "[::1]:${toString prometheusPort}"
-      ];
+    scrapeConfigs = [{
+      job_name = "endlessh-go";
+
+      static_configs = [{
+        labels.job = "endlessh-go";
+        targets    = [
+          "[::1]:${toString prometheusPort}"
+        ];
+      }];
     }];
-  }];
+  };
 
-  nixpkgs.config.allowUnfree = true; # For pkgs.clash-geoip.
-
-  # services.endlessh-go.openFirewall exposes both the Prometheus
+  # `services.endlessh-go.openFirewall` exposes both the Prometheus
   # exporters port and the SSH port, and we don't want the metrics
   # to leak, so we manually expose this like so.
   networking.firewall.allowedTCPPorts = [ fakeSSHPort ];
@@ -31,10 +36,5 @@ in serverSystemConfiguration {
       "-geoip_supplier max-mind-db"
       "-max_mind_db ${pkgs.clash-geoip}/etc/clash/Country.mmdb"
     ];
-
-    prometheus = enabled {
-      listenAddress = "[::1]";
-      port          = prometheusPort;
-    };
   };
 }

modules/steam.nix

@@ -3,8 +3,6 @@
 (desktopSystemConfiguration {
   # Steam uses 32-bit drivers for some unholy fucking reason.
   hardware.opengl.driSupport32Bit = true;
-
-  nixpkgs.config.allowUnfree = true;
 })
 
 (desktopUserHomePackages (with pkgs; [