From 3b24d5ae26216df5599fdeaf781d6575b5c29aa5 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 5 Sep 2025 15:53:14 -0500 Subject: [PATCH] Cleanup external references --- flake.lock | 245 +++++++++++++++++++++++++++++++++-- flake.nix | 2 +- modules/nixos/kubernetes.nix | 4 +- 3 files changed, 238 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d9dabec..9654303 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,28 @@ "type": "github" } }, + "charts": { + "inputs": { + "flake-utils": "flake-utils_2", + "haumea": "haumea", + "nix-kube-generators": "nix-kube-generators", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1757035572, + "narHash": "sha256-GvI7osKYW7Rufa6WS361vwBAul+okcnI00ExNUtk950=", + "owner": "nix-community", + "repo": "nixhelm", + "rev": "8a7daca797bd0f488ff5e3b52f4faf913c90ec2e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixhelm", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -251,13 +273,30 @@ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, "original": { "owner": "numtide", "repo": "flake-utils", "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_6" }, @@ -275,6 +314,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -296,6 +353,28 @@ "type": "github" } }, + "haumea": { + "inputs": { + "nixpkgs": [ + "charts", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, "hmunstable": { "inputs": { "nixpkgs": [ @@ -342,7 +421,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1755446520, @@ -386,6 +465,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "charts", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-hardware": { "locked": { "lastModified": 1755330281, @@ -401,6 +502,21 @@ "type": "github" } }, + "nix-kube-generators": { + "locked": { + "lastModified": 1729269463, + "narHash": "sha256-8jDDpC99fYl5CSHjZyPwb5PK7nQSknhkpfe8+DXI910=", + "owner": "farcaller", + "repo": "nix-kube-generators", + "rev": "2be4f3cb99e179d9f94e6c8723862421437f8efb", + "type": "github" + }, + "original": { + "owner": "farcaller", + "repo": "nix-kube-generators", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -515,6 +631,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1754340878, "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", @@ -530,7 +662,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -546,7 +678,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -585,7 +717,7 @@ "nixunstable" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_7" }, "locked": { "lastModified": 1755095763, @@ -605,7 +737,7 @@ "nurpkgs": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1755452770, @@ -623,7 +755,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvimunstable", @@ -644,6 +776,31 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "charts", + "nixpkgs" + ], + "systems": "systems_5", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1738741221, + "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "proxmox": { "inputs": { "flake-compat": "flake-compat_2", @@ -669,6 +826,7 @@ "inputs": { "agenix": "agenix", "btc": "btc", + "charts": "charts", "darwin": "darwin_2", "flake-parts": "flake-parts", "hmunstable": "hmunstable", @@ -773,9 +931,76 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "charts", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -793,8 +1018,8 @@ }, "vsext": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1755396877, diff --git a/flake.nix b/flake.nix index 4ad504c..126e622 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ }) ); charts_overlay = ( - _f: _p: { inherit (top) chartsMetadata; } + _f: _p: { inherit (top.charts) chartsMetadata; } ); overlays = [ top.agenix.overlays.default diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix index 679f544..0eba161 100644 --- a/modules/nixos/kubernetes.nix +++ b/modules/nixos/kubernetes.nix @@ -129,8 +129,8 @@ in manifests = { cert-manager.source = cert-manager; flux.source = flux; - node-annotations.content = ../../manifests/nodes.yaml; - operator-oauth.content = ../../manifests/external-secrets/operator-oauth.yaml; + node-annotations.source = ../../manifests/nodes.yaml; + operator-oauth.source = ../../manifests/secrets/operator-oauth.yaml; }; role = if cfg.agentOnly then "agent" else "server"; serverAddr = lib.mkIf (config.networking.hostName != "isaiah") "https://isaiah.home:6443";