From 730812efd713989c783d6ec0d699cd2be1f1160b Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 14 Nov 2026 04:25:34 +0000 Subject: krops.nix: read nixpkgs and target from systems/*/spec.nix --- krops.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/krops.nix b/krops.nix index 81445ad..6681007 100644 --- a/krops.nix +++ b/krops.nix @@ -8,9 +8,14 @@ , pkgs ? import ~/sync/src/krops/pkgs {} , name , target ? null -}: rec { +}@args: rec { - target = "root@${name}.r/var/src"; + spec = { + nixpkgs = "nixos-26.05"; + target = "root@${name}.r/var/src"; + } // import ./systems/${name}/spec.nix; + + target = if args.target or null != null then args.target else spec.target; source = lib.evalSource [ { @@ -21,7 +26,7 @@ target = "hrm/systems/${name}/config.nix"; }; nixpkgs.git = { - ref = (lib.importJSON ./nixpkgs.json)."nixos-26.05".rev; + ref = (lib.importJSON ./nixpkgs.json).${spec.nixpkgs}.rev; url = "https://github.com/NixOS/nixpkgs"; }; secrets.passage = { -- cgit v1.3.1