7 files changed, 199 insertions, 15 deletions
diff --git a/nixos/shared/alloy-nix-config/alloy_nix_config.go b/nixos/shared/alloy-nix-config/alloy_nix_config.go
new file mode 100644
index 0000000..4b6eb63
--- /dev/null
+++ b/nixos/shared/alloy-nix-config/alloy_nix_config.go
@@ -0,0 +1,129 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"maps"
+	"os"
+	"slices"
+	"strconv"
+	"strings"
+)
+
+func main() {
+	if len(os.Args) != 3 {
+		fmt.Fprintf(os.Stderr, "usage: %s <json_path> <out_path>\n", os.Args[0])
+		os.Exit(1)
+	}
+
+	jsonPath := os.Args[1]
+	outPath := os.Args[2]
+
+	jsonData, err := os.ReadFile(jsonPath)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error reading file %s: %v\n", jsonPath, err)
+		os.Exit(1)
+	}
+
+	// It would be nice to preserve the order of blocks ... except that we can't
+	// because Nix already doesn't preserve the order of attribute sets.
+	var config map[string]any
+	if err := json.Unmarshal(jsonData, &config); err != nil {
+		fmt.Fprintf(os.Stderr, "error parsing JSON: %v\n", err)
+		os.Exit(1)
+	}
+
+	result := formatConfig(config)
+
+	if err := os.WriteFile(outPath, []byte(result), 0644); err != nil {
+		fmt.Fprintf(os.Stderr, "error writing file %s: %v\n", outPath, err)
+		os.Exit(1)
+	}
+}
+
+func formatConfig(config map[string]any) string {
+	var s strings.Builder
+
+	for _, blockName := range slices.Sorted(maps.Keys(config)) {
+		labels := config[blockName]
+
+		if labelsMap, ok := labels.(map[string]any); ok {
+			for label, block := range labelsMap {
+				if blockMap, ok := block.(map[string]any); ok {
+					s.WriteString(formatBlock(blockName, label, blockMap, 0))
+				}
+			}
+		}
+	}
+
+	return s.String()
+}
+
+func formatBlock(blockName string, label string, block map[string]any, indent int) string {
+	var s strings.Builder
+
+	s.WriteString(strings.Repeat("  ", indent))
+	s.WriteString(blockName)
+	if label != "" {
+		s.WriteString(fmt.Sprintf(` %s`, strconv.Quote(label)))
+	}
+	s.WriteString(" {\n")
+
+	var blocks []any
+	if blocksValue, exists := block["blocks"]; exists {
+		if blocksList, ok := blocksValue.([]any); ok {
+			blocks = blocksList
+		}
+		delete(block, "blocks")
+	}
+
+	for _, key := range slices.Sorted(maps.Keys(block)) {
+		s.WriteString(strings.Repeat("  ", indent+1))
+		s.WriteString(fmt.Sprintf("%s = %s\n", key, formatValue(block[key])))
+	}
+
+	for _, blockItem := range blocks {
+		if blockMap, ok := blockItem.(map[string]any); ok {
+			var name string
+			if nameValue, exists := blockMap["name"]; exists {
+				if nameStr, ok := nameValue.(string); ok {
+					name = nameStr
+				}
+				delete(blockMap, "name")
+			}
+
+			s.WriteString(formatBlock(name, "", blockMap, indent+1))
+		}
+	}
+
+	s.WriteString(strings.Repeat("  ", indent))
+	s.WriteString("}\n")
+
+	return s.String()
+}
+
+func formatValue(value any) string {
+	switch v := value.(type) {
+	case string:
+		return strconv.Quote(v)
+	case map[string]any:
+		if ref, exists := v["$ref"]; exists {
+			if refStr, ok := ref.(string); ok {
+				return refStr
+			}
+		}
+		var parts []string
+		for _, name := range slices.Sorted(maps.Keys(v)) {
+			parts = append(parts, fmt.Sprintf("%s=%s,", name, formatValue(v[name])))
+		}
+		return "{" + strings.Join(parts, " ") + "}"
+	case []any:
+		var parts []string
+		for _, item := range v {
+			parts = append(parts, formatValue(item))
+		}
+		return "[" + strings.Join(parts, ", ") + "]"
+	default:
+		return fmt.Sprintf("%v", v)
+	}
+}
diff --git a/nixos/shared/alloy-nix-config/default.nix b/nixos/shared/alloy-nix-config/default.nix
new file mode 100644
index 0000000..d4efe02
--- /dev/null
+++ b/nixos/shared/alloy-nix-config/default.nix
@@ -0,0 +1,8 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.buildGoModule {
+  pname = "alloy-nix-config";
+  version = "git";
+  src = ./.;
+  vendorHash = null;
+}
diff --git a/nixos/shared/alloy-nix-config/go.mod b/nixos/shared/alloy-nix-config/go.mod
new file mode 100644
index 0000000..2916089
--- /dev/null
+++ b/nixos/shared/alloy-nix-config/go.mod
@@ -0,0 +1,3 @@
+module push-f.com/alloy-nix-config
+
+go 1.24.5
diff --git a/nixos/shared/grafana-matrix-forwarder/default.nix b/nixos/shared/grafana-matrix-forwarder/default.nix
new file mode 100644
index 0000000..7a04dcb
--- /dev/null
+++ b/nixos/shared/grafana-matrix-forwarder/default.nix
@@ -0,0 +1,10 @@
+{ buildGoModule }:
+let
+  sources = import <top/npins>;
+in
+buildGoModule {
+  pname = "grafana-matrix-forwarder";
+  version = sources.grafana-matrix-forwarder.version;
+  src = sources.grafana-matrix-forwarder;
+  vendorHash = "sha256-ifkeakyRkIF2Y/4otUWhTvUzsPwRb1Wxx6gqN0806c4=";
+}
diff --git a/nixos/shared/grafana-matrix-forwarder/service.nix b/nixos/shared/grafana-matrix-forwarder/service.nix
new file mode 100644
index 0000000..5ad511c
--- /dev/null
+++ b/nixos/shared/grafana-matrix-forwarder/service.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+let
+  grafanaMatrixForwarder = pkgs.callPackage ./default.nix {};
+  cfg = config.services.grafana-matrix-forwarder;
+in
+{
+  options.services.grafana-matrix-forwarder = {
+    enable = lib.mkEnableOption "grafana-matrix-forwarder";
+    port = lib.mkOption {
+      type = lib.types.int;
+    };
+    homeserver = lib.mkOption {
+      type = lib.types.str;
+    };
+    environmentFile = lib.mkOption {
+      type = lib.types.path;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.grafana-matrix-forwarder = {
+      serviceConfig = {
+        ExecStart = "${grafanaMatrixForwarder}/bin/grafana-matrix-forwarder --port=${toString cfg.port} --homeserver ${cfg.homeserver}";
+        EnvironmentFile = cfg.environmentFile;
+        DynamicUser = "true";
+      };
+      wantedBy = ["multi-user.target"];
+    };
+  };
+}
diff --git a/nixos/shared/prometheus-sql-exporter/default.nix b/nixos/shared/prometheus-sql-exporter/default.nix
index 81f1660..5d80a62 100644
--- a/nixos/shared/prometheus-sql-exporter/default.nix
+++ b/nixos/shared/prometheus-sql-exporter/default.nix
@@ -1,21 +1,15 @@
 {
   lib,
   buildGoModule,
-  fetchFromGitHub,
 }:
-
-buildGoModule rec {
+let
+  sources = import <top/npins>;
+in
+buildGoModule {
   pname = "sql_exporter";
-  version = "0.17.1";
-
-  src = fetchFromGitHub {
-    owner = "burningalchemist";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-AEPFXPplHtny1P3gMvB1gbMj10bpu9PXc6ywliF+dCc=";
-  };
-
-  vendorHash = "sha256-KFWDqbdbXvgEtz1nlasWrvIckpzasUdzbb+AKfXmYf8=";
+  version = sources.prometheus-sql-exporter.version;
+  src = sources.prometheus-sql-exporter;
+  vendorHash = "sha256-eZxxmqoiXPdjZs/lwbzvWco9mDFy0zmpGDcqTIyWbK4=";
 
   meta = with lib; {
     description = "Database-agnostic SQL exporter for Prometheus";
diff --git a/nixos/shared/prometheus-sql-exporter/service.nix b/nixos/shared/prometheus-sql-exporter/service.nix
index a887f91..a79528c 100644
--- a/nixos/shared/prometheus-sql-exporter/service.nix
+++ b/nixos/shared/prometheus-sql-exporter/service.nix
@@ -4,7 +4,16 @@
 let
   sqlExporter = pkgs.callPackage ./default.nix {};
   cfg = config.services.prometheus-sql-exporter;
-  configFile =  builtins.toFile "config.yaml" (builtins.toJSON cfg.config);
+  configFile = builtins.toFile "config.yaml" (builtins.toJSON cfg.config);
+  validateConfig = file:
+    pkgs.runCommand "validate-config"
+      {
+        nativeBuildInputs = [sqlExporter];
+      }
+      ''
+        sql_exporter -config.check -config.file "${file}"
+        ln -s "${file}" "$out"
+      '';
 in
 {
   options.services.prometheus-sql-exporter = {
@@ -20,7 +29,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.prometheus-sql-exporter = {
       serviceConfig = {
-        ExecStart = "${sqlExporter}/bin/sql_exporter -config.file ${configFile} -web.listen-address :${toString cfg.port}";
+        ExecStart = "${sqlExporter}/bin/sql_exporter -config.file ${validateConfig configFile} -web.listen-address :${toString cfg.port}";
         DynamicUser = "true";
         User = "prometheus-sql-exporter";
       };