kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

unuse lookup paths

Browse source
This commit is contained in:
Kiara Grouwstra 2025-05-09 16:16:12 +02:00
parent a34ebc8a34
commit 21c4cab1e0
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
launch/main.tf
View file

@ -59,10 +59,6 @@ resource "terraform_data" "nixos" {
# note that absolute paths can cause false positives in triggers, # note that absolute paths can cause false positives in triggers,
# so are generally discouraged in TF. # so are generally discouraged in TF.
working_dir = path.root working_dir = path.root
environment = {
# nix path used on build, lets us refer to e.g. nixpkgs like `<nixpkgs>`
NIX_PATH = local.nix_path
}
# TODO: refactor back to command="ignoreme" interpreter=concat([]) to protect sensitive data from error logs? # TODO: refactor back to command="ignoreme" interpreter=concat([]) to protect sensitive data from error logs?
# TODO: build on target? # TODO: build on target?
command = <<-EOF command = <<-EOF
@ -74,7 +70,8 @@ resource "terraform_data" "nixos" {
--show-trace --show-trace
--expr --expr
'let 'let
os = import <nixpkgs/nixos> { sources = import ../npins;
os = import "$${sources.nixpkgs}/nixos" {
system = "${local.system}"; system = "${local.system}";
configuration = { configuration = {
# note interpolations here TF ones # note interpolations here TF ones

7
launch/shared.nix
View file

@ -5,11 +5,12 @@
}: }:
let let
inherit (config.terraform) hostname domain initialUser; inherit (config.terraform) hostname domain initialUser;
sources = import ../npins;
in in
{ {
imports = [ imports = with sources; [
<disko/module.nix> "${disko}/module.nix"
<agenix/modules/age.nix> "${agenix}/modules/age.nix"
../services/fediversity ../services/fediversity
./resource.nix ./resource.nix
]; ];