From ec8c826565017a6aae093ef41e421cdec7fee121 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 17 Apr 2026 15:54:48 -0500 Subject: [PATCH] chore: fix building --- flake.lock | 204 ++---------------------------------- flake.nix | 3 - home/hosts/work/default.nix | 7 -- network.json | 12 ++- 4 files changed, 19 insertions(+), 207 deletions(-) delete mode 100644 home/hosts/work/default.nix diff --git a/flake.lock b/flake.lock index 779db0d..983e91f 100644 --- a/flake.lock +++ b/flake.lock @@ -46,36 +46,12 @@ "type": "github" } }, - "charts": { - "inputs": { - "flake-utils": "flake-utils", - "haumea": "haumea", - "nix-kube-generators": "nix-kube-generators", - "nixpkgs": "nixpkgs", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1776307304, - "narHash": "sha256-JrIt6c4GPl5V7JFMlv4E78JA+cOVV/akmP0MXCAd7cs=", - "owner": "nix-community", - "repo": "nixhelm", - "rev": "5194fa4b3f8a09d74978057cd9ef70b28a910543", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixhelm", - "type": "github" - } - }, "colmena": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stable": "stable" }, "locked": { @@ -249,24 +225,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -281,28 +239,6 @@ "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" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": [ @@ -406,28 +342,13 @@ "type": "github" } }, - "nix-kube-generators": { - "locked": { - "lastModified": 1762437901, - "narHash": "sha256-5yuJODagAq+aMXQAT2c0gfXKLqapmA6eUHR33jKNHuU=", - "owner": "farcaller", - "repo": "nix-kube-generators", - "rev": "810dcf792081790648ba9ae705b9a2286115ace8", - "type": "github" - }, - "original": { - "owner": "farcaller", - "repo": "nix-kube-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -453,22 +374,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1776169885, "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", @@ -484,7 +389,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1766025857, "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", @@ -522,7 +427,7 @@ "nixpkgs": [ "nixunstable" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1776350339, @@ -542,7 +447,7 @@ "nurpkgs": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1776350162, @@ -558,61 +463,10 @@ "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "charts", - "nixpkgs" - ], - "pyproject-nix": [ - "charts", - "pyproject-nix" - ], - "uv2nix": [ - "charts", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1763662255, - "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "042904167604c681a090c07eb6967b4dd4dae88c", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "charts", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764134915, - "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "2c8df1383b32e5443c921f61224b198a2282a657", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "buildbot": "buildbot", - "charts": "charts", "colmena": "colmena", "darwin": "darwin_2", "flake-parts": "flake-parts_2", @@ -671,21 +525,6 @@ "type": "github" } }, - "systems_3": { - "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": [ @@ -707,34 +546,9 @@ "type": "github" } }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "charts", - "nixpkgs" - ], - "pyproject-nix": [ - "charts", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1767701098, - "narHash": "sha256-CJhKZnWb3gumR9oTRjFvCg/6lYTGbZRU7xtvcyWIRwU=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "9d357f0d2ce6f5f35ec7959d7e704452352eb4da", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, "vsext": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1776310443, diff --git a/flake.nix b/flake.nix index d6a0cd0..d988e51 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,6 @@ url = "github:nix-community/buildbot-nix"; inputs.nixpkgs.follows = "nixunstable"; }; - charts = { - url = "github:nix-community/nixhelm"; - }; colmena.url = "github:zhaofengli/colmena"; darwin = { url = "github:lnl7/nix-darwin/master"; diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix deleted file mode 100644 index fb5f07c..0000000 --- a/home/hosts/work/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - greg.vscodium.enable = false; - - home.packages = with pkgs; [ brew ]; -} diff --git a/network.json b/network.json index 0090e7d..795d939 100644 --- a/network.json +++ b/network.json @@ -77,6 +77,10 @@ "external": true, "system": "aarch64-darwin" }, + "lithic": { + "external": true, + "system": "aarch64-darwin" + }, "linode": { "ip": null, "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q", @@ -85,13 +89,17 @@ "tags": ["public", "server"], "nebulaIp": "10.157.0.1" }, + "ivr": { + "external": true, + "system": "aarch64-darwin" + }, "MacBook-Pro.local": { "external": true, - "system": "aarc64-darwin" + "system": "aarch64-darwin" }, "MacBook-Prolocal.local": { "external": true, - "system": "aarc64-darwin" + "system": "aarch64-darwin" }, "nas1": { "external": true,