From cc28714edec244299869f3fe9a759457288cd4ce Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Fri, 31 Oct 2025 00:25:26 +0800 Subject: [PATCH] Revert "add colmena" This reverts commit 97c47ca04a9fbf95ef2405c30b407e32701233f3. --- flake.nix | 50 ++++++------------- .../yadunut@yadunut-mbp/default.nix | 1 - 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/flake.nix b/flake.nix index c1a47fd..0539e5f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { agenix.url = "github:ryantm/agenix"; - colmena.url = "github:zhaofengli/colmena"; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,41 +24,20 @@ outputs = inputs: - let - flake = inputs.snowfall-lib.mkFlake { - inherit inputs; - src = ./.; - snowfall = { - namespace = "snowfall"; - }; - systems.modules.nixos = with inputs; [ - agenix.nixosModules.default - ]; - homes.modules = with inputs; [ - agenix.homeManagerModules.default - ]; - channels-config = { - allowUnfree = true; - }; + inputs.snowfall-lib.mkFlake { + inherit inputs; + src = ./.; + snowfall = { + namespace = "snowfall"; }; - inv = import ./inventory.nix; - mkNode = name: node: { - imports = [ (./systems/x86_64-linux + "/${name}") ]; - deployment.targetHost = node.zerotierIp; + systems.modules.nixos = with inputs; [ + agenix.nixosModules.default + ]; + homes.modules = with inputs; [ + agenix.homeManagerModules.default + ]; + channels-config = { + allowUnfree = true; }; - colmenaNodes = builtins.mapAttrs mkNode inv.nodes; - colmenaHive = inputs.colmena.lib.makeHive ( - { - meta = { - nixpkgs = import inputs.nixpkgs { - system = "x86_64-linux"; - config.allowUnfree = true; - }; - specialArgs = { inherit inputs; }; - }; - } - // colmenaNodes - ); - in - flake // { colmenaHive = colmenaHive; }; + }; } diff --git a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix index ad5158b..c4d315f 100644 --- a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix +++ b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix @@ -22,7 +22,6 @@ pkgs.claude-code pkgs.codex pkgs.amp-cli - inputs.colmena.packages.aarch64-darwin.colmena ]; home.sessionVariables = {