From 9ede750a7685dbd510401b6e93a0fef95ccc3671 Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Sun, 2 Mar 2025 18:10:54 -0800
Subject: [PATCH] [mcp] Reorganizing container files

---
 system/hosts/mcp/containers/grafana.nix       | 30 ++++++++-----------
 .../hosts/mcp/containers/shared-postgres.nix  |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/system/hosts/mcp/containers/grafana.nix b/system/hosts/mcp/containers/grafana.nix
index 2a05687..978965f 100644
--- a/system/hosts/mcp/containers/grafana.nix
+++ b/system/hosts/mcp/containers/grafana.nix
@@ -1,28 +1,24 @@
-{ ... }:
-{
-
+{ config, ... }:
+let
+  lib = import ./lib.nix config;
+in {
   imports = [
     ./shared-postgres.nix
   ];
 
-  virtulisation.oci-containers.grafana = {
+  virtualisation.oci-containers.containers.grafana = lib.mkContainer {
     image = "grafana/grafana-enterprise";
-    autoStart = true;
     dependsOn = [
       "db"
     ];
-    extraOptions = [
-      "-l=traefik.enable=true"
-        "-l=traefik.http.routers.grafana.rule=${localHostRule "grafana"}"
-        "-l=traefik.http.services.grafana.loadbalancer.server.port=3000"
-        "-l=homepage.group=Infra"
-        "-l=homepage.name=Grafana"
-        "-l=homepage.icon=grafana.png"
-        "-l=homepage.href=https://grafana.${domain}"
-        "-l=homepage.description=Database visualization"
-        "-l=homepage.widget.type=grafana"
-        "-l=homepage.widget.url=http://grafana.havenisms.com:3000"
-    ];
+    hostName = "grafana";
+    port = 3000;
+    homepageOpts = {
+      group = "Infra";
+      icon = "grafana.png";
+      name = "Grafana";
+      description = "Database Visualization";
+    };
     volumes = [
       "grafana-storage:/var/lib/grafana"
     ];
diff --git a/system/hosts/mcp/containers/shared-postgres.nix b/system/hosts/mcp/containers/shared-postgres.nix
index 00befc8..403d64e 100644
--- a/system/hosts/mcp/containers/shared-postgres.nix
+++ b/system/hosts/mcp/containers/shared-postgres.nix
@@ -1,7 +1,7 @@
 # Shared Postgres Database
 { ... }:
 {
-  virtualisation.oci-containers.db = {
+  virtualisation.oci-containers.containers.db = {
     image = "docker.io/postgres:16-alpine";
     autoStart = true;
     volumes = [