From 8964529f1a121ee5fe2b491c07bf1e6c8c5df1d7 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 7 Dec 2025 17:53:31 -0600 Subject: [PATCH] Reduce amount of inputs --- flake.nix | 6 ------ modules/nixos/kubernetes.nix | 13 +++++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index c39dd50..e3237b2 100644 --- a/flake.nix +++ b/flake.nix @@ -61,14 +61,8 @@ pkgs = prev; }) ); - charts_overlay = ( - _f: _p: { - chartsMetadata = top.charts.chartsMetadata; - } - ); overlays = [ top.agenix.overlays.default - charts_overlay local_overlay packages_overlay top.nixvimunstable.overlays.default diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix index 0d55113..d0c0055 100644 --- a/modules/nixos/kubernetes.nix +++ b/modules/nixos/kubernetes.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + top, ... }: let @@ -84,9 +85,9 @@ in enable = true; autoDeployCharts = { external-secrets = { - inherit (pkgs.chartsMetadata.external-secrets.external-secrets) repo version; + inherit (top.charts.chartsMetadata.external-secrets.external-secrets) repo version; enable = true; - name = pkgs.chartsMetadata.external-secrets.external-secrets.chart; + name = top.charts.chartsMetadata.external-secrets.external-secrets.chart; hash = "sha256-w0wlFtECXg4/F8Ke26wQexGcbDIfjqvsZwZYeJyVmLU="; createNamespace = true; targetNamespace = "external-secrets"; @@ -96,9 +97,9 @@ in }; }; kyverno = { - inherit (pkgs.chartsMetadata.kyverno.kyverno) repo version; + inherit (top.charts.chartsMetadata.kyverno.kyverno) repo version; enable = true; - name = pkgs.chartsMetadata.kyverno.kyverno.chart; + name = top.charts.chartsMetadata.kyverno.kyverno.chart; hash = "sha256-QFdrhgziOIe194ltl00JkH3BAQHHury9qSgAX/YZzOg="; createNamespace = true; targetNamespace = "kyverno-system"; @@ -111,9 +112,9 @@ in }; }; tailscale = { - inherit (pkgs.chartsMetadata.tailscale.tailscale-operator) repo version; + inherit (top.charts.chartsMetadata.tailscale.tailscale-operator) repo version; enable = true; - name = pkgs.chartsMetadata.tailscale.tailscale-operator.chart; + name = top.charts.chartsMetadata.tailscale.tailscale-operator.chart; hash = "sha256-8pZyWgBTDtnUXnYzDCtbXtTzvUe35BnqHckI/bBuk7o="; createNamespace = true; targetNamespace = "tailscale";