From 682b533b49a4c45c0e1fcb36b19b46891f5c8f37 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sun, 11 May 2025 12:43:33 +0200
Subject: [PATCH] switch imports from lookup paths to explicit npins to keep
 things pure for tests

---
 infra/common/nixos/hardware.nix | 4 +++-
 services/vm/garage-vm.nix       | 2 +-
 services/vm/mastodon-vm.nix     | 2 +-
 services/vm/peertube-vm.nix     | 2 +-
 services/vm/pixelfed-vm.nix     | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/infra/common/nixos/hardware.nix b/infra/common/nixos/hardware.nix
index c01ced2f..6800eb49 100644
--- a/infra/common/nixos/hardware.nix
+++ b/infra/common/nixos/hardware.nix
@@ -1,7 +1,9 @@
 { modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+  imports = [
+    "${modulesPath}/profiles/qemu-guest.nix"
+  ];
 
   boot = {
     loader = {
diff --git a/services/vm/garage-vm.nix b/services/vm/garage-vm.nix
index 8cad6598..b578a16a 100644
--- a/services/vm/garage-vm.nix
+++ b/services/vm/garage-vm.nix
@@ -10,7 +10,7 @@ let
 
 in
 {
-  imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
+  imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
 
   fediversity.garage.enable = true;
 
diff --git a/services/vm/mastodon-vm.nix b/services/vm/mastodon-vm.nix
index 095f822e..6eaca887 100644
--- a/services/vm/mastodon-vm.nix
+++ b/services/vm/mastodon-vm.nix
@@ -7,7 +7,7 @@
 }:
 {
 
-  imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
+  imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
 
   config = lib.mkMerge [
     {
diff --git a/services/vm/peertube-vm.nix b/services/vm/peertube-vm.nix
index 7aedbc3d..621977fc 100644
--- a/services/vm/peertube-vm.nix
+++ b/services/vm/peertube-vm.nix
@@ -5,7 +5,7 @@
 }:
 
 {
-  imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
+  imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
 
   fediversity = {
     domain = "localhost";
diff --git a/services/vm/pixelfed-vm.nix b/services/vm/pixelfed-vm.nix
index 8c35aeec..3ace0f2c 100644
--- a/services/vm/pixelfed-vm.nix
+++ b/services/vm/pixelfed-vm.nix
@@ -11,7 +11,7 @@ let
 in
 
 {
-  imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
+  imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
 
   fediversity = {
     domain = "localhost";