From 893db983e0f096ce80525e25edafc0da9fc06a6f Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 23 Nov 2025 14:43:36 -0600
Subject: [PATCH] Fix broken auto-deployments

---
 flake.nix                           |  5 ++---
 manifests/bitwarden/deployment.yaml |  6 +++---
 modules/nixos/kubernetes.nix        | 12 +++++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7808cb8..ca45cb3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,8 +68,7 @@
       );
       charts_overlay = (
         _f: _p: {
-          chartsDerivations = top.charts.chartsDerivations."${_p.stdenv.hostPlatform.system}";
-          kubelib = top.nix-kube-generators.lib;
+          chartsMetadata = top.charts.chartsMetadata;
         }
       );
       overlays = [
@@ -113,7 +112,7 @@
           ...
         }:
         {
-          _module.args = {
+          _module.args = rec {
             pkgs = import top.nixunstable { inherit system overlays; };
           };
 
diff --git a/manifests/bitwarden/deployment.yaml b/manifests/bitwarden/deployment.yaml
index 6dfd9c7..5b0938b 100644
--- a/manifests/bitwarden/deployment.yaml
+++ b/manifests/bitwarden/deployment.yaml
@@ -24,9 +24,9 @@ spec:
           # Since my gitlab instance depends on the database hosted in k3s, and
           # the database depends on this image, I need a way to bootstrap the
           # system if # I am doing disaster recovery. And this is it.
-          #image: "ghcr.io/greg-hellings/nixos-config/img-bitwarden:latest"
-          image: >-
-            registry.thehellings.com/greg/nixos-config/img-bitwarden:latest
+          image: "ghcr.io/greg-hellings/nixos-config/img-bitwarden:latest"
+          #image: >-
+          #  registry.thehellings.com/greg/nixos-config/img-bitwarden:latest
           imagePullPolicy: Always
           env:
             - name: BW_CLIENTID
diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix
index a374006..017cede 100644
--- a/modules/nixos/kubernetes.nix
+++ b/modules/nixos/kubernetes.nix
@@ -80,9 +80,11 @@ in
         enable = true;
         autoDeployCharts = {
           external-secrets = {
+            inherit (pkgs.chartsMetadata.external-secrets.external-secrets) repo version;
             enable = true;
+            name = pkgs.chartsMetadata.external-secrets.external-secrets.chart;
+            hash = "sha256-w0wlFtECXg4/F8Ke26wQexGcbDIfjqvsZwZYeJyVmLU=";
             createNamespace = true;
-            package = pkgs.chartsDerivations.external-secrets.external-secrets;
             targetNamespace = "external-secrets";
             values = {
               crds.create = true;
@@ -90,9 +92,11 @@ in
             };
           };
           kyverno = {
+            inherit (pkgs.chartsMetadata.kyverno.kyverno) repo version;
             enable = true;
+            name = pkgs.chartsMetadata.kyverno.kyverno.chart;
+            hash = "sha256-QFdrhgziOIe194ltl00JkH3BAQHHury9qSgAX/YZzOg=";
             createNamespace = true;
-            package = pkgs.chartsDerivations.kyverno.kyverno;
             targetNamespace = "kyverno-system";
             values = {
               admissionController.replicas = 3;
@@ -103,9 +107,11 @@ in
             };
           };
           tailscale = {
+            inherit (pkgs.chartsMetadata.tailscale.tailscale-operator) repo version;
             enable = true;
+            name = pkgs.chartsMetadata.tailscale.tailscale-operator.chart;
+            hash = "sha256-89MSeInAckiBsCK0ag2hrflVBWGgVvl22uy8xk9HU2g=";
             createNamespace = true;
-            package = pkgs.chartsDerivations.tailscale.tailscale-operator;
             targetNamespace = "tailscale";
           };
         };