From 6ae9bfac9e5c1a34b6abce10640dfd2350171a26 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Thu, 19 Jun 2025 10:24:24 +0200 Subject: [PATCH] add (npins-based) imports --- infra/common/resource.nix | 4 ++-- infra/forgejo-ci/flake-part.nix | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/infra/common/resource.nix b/infra/common/resource.nix index 46f0834d..a321ec62 100644 --- a/infra/common/resource.nix +++ b/infra/common/resource.nix @@ -36,8 +36,8 @@ in ## should go into the `./nixos` subdirectory. nixos.module = { imports = [ - (import "${agenix}/modules/age.nix") - (import "${disko}/module.nix") + "${agenix}/modules/age.nix" + "${disko}/module.nix" ./options.nix ./nixos ]; diff --git a/infra/forgejo-ci/flake-part.nix b/infra/forgejo-ci/flake-part.nix index 2c6b72b8..9bb9c4d9 100644 --- a/infra/forgejo-ci/flake-part.nix +++ b/infra/forgejo-ci/flake-part.nix @@ -14,6 +14,7 @@ let keys = import ../../keys; hostPublicKey = keys.systems.forgejo-ci; + sources = import ../../npins; in { nixops4Deployments.forgejo-ci = @@ -34,8 +35,9 @@ in nixpkgs = inputs.nixpkgs; nixos.module = { - imports = [ - inputs.agenix.nixosModules.default + imports = with sources; [ + "${agenix}/modules/age.nix" + "${disko}/module.nix" ./configuration.nix ];