From 4374f8ca7987419f1cbf46e1648accb7144dccf4 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Wed, 25 Dec 2024 14:05:00 +0100
Subject: [PATCH] misc: clean module

---
 module.nix | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/module.nix b/module.nix
index ba08e10..01afc9b 100644
--- a/module.nix
+++ b/module.nix
@@ -5,13 +5,8 @@ let
 in
 {
   options.services.sflow-exporter = {
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.sflow-exporter;
-      defaultText = lib.literalExpression "pkgs.sflow-exporter";
-      description = lib.mdDoc "Which sflow_exporzer derivation to use.";
-    };
     enable = lib.mkEnableOption "sflow_exporter";
+    package = lib.mkPackageOption pkgs "sflow-exporter" { };
     listen = {
       sflow = {
         addr = lib.mkOption {
@@ -53,21 +48,20 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
+      environment =
+        let
+          addrToString = addr: port: "${if (lib.hasInfix ":" addr) then "[${addr}]" else addr}:${toString port}";
+        in
+        {
+          SFLOW_EXPORTER_SFlOW_LISTEN_ADDR = addrToString cfg.listen.sflow.addr cfg.listen.sflow.port;
+          SFLOW_EXPORTER_METRICS_LISTEN_ADDR = addrToString cfg.listen.metrics.addr cfg.listen.metrics.port;
+          SFLOW_EXPORTER_META = cfg.metaPath;
+        };
+
       serviceConfig = {
         ExecStart = "${lib.getExe cfg.package} listen";
         DynamicUser = true;
         User = "sflow_exporter";
-
-        Environment =
-          let
-            sflowAddr = cfg.listen.sflow.addr;
-            metricsAddr = cfg.listen.metrics.addr;
-          in
-          [
-            "SFLOW_EXPORTER_SFlOW_LISTEN_ADDR=${if (lib.hasInfix ":" sflowAddr) then "[${sflowAddr}]" else sflowAddr}:${toString cfg.listen.sflow.port}"
-            "SFLOW_EXPORTER_METRICS_LISTEN_ADDR=${if (lib.hasInfix ":" metricsAddr) then "[${metricsAddr}]" else metricsAddr}:${toString cfg.listen.metrics.port}"
-            "SFLOW_EXPORTER_META=${cfg.metaPath}"
-          ];
       };
     };
   };