From 1ec72591183a56b0bc9f7e94c7647a0477b22211 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Fri, 4 Nov 2022 12:12:37 +0100
Subject: [PATCH] Correct arguments for common

---
 lib/mk_computer.nix            | 2 +-
 lib/mk_raspi.nix               | 2 +-
 modules/common-x86/default.nix | 4 ++--
 modules/common/default.nix     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 1d1f472..e70ea8f 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -41,7 +41,7 @@ inputs.nixpkgs.lib.nixosSystem
       })
 
       # Common configuration
-      "${inputs.self}/modules/common-x86"
+      (import "${inputs.self}/modules/common-x86" { inherit custom inputs; })
 
       inputs.agenix.nixosModules.age
       { environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; }
diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix
index 536df9c..6868793 100644
--- a/lib/mk_raspi.nix
+++ b/lib/mk_raspi.nix
@@ -28,7 +28,7 @@ inputs.nixpkgs.lib.nixosSystem {
         { inherit custom hostname inputs; })
 
       # Common configuration
-      "${inputs.self}/modules/common"
+      (import "${inputs.self}/modules/common" { inherit custom inputs; })
 
       inputs.agenix.nixosModules.age
       { environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; }
diff --git a/modules/common-x86/default.nix b/modules/common-x86/default.nix
index 15d2a02..fbf50ef 100644
--- a/modules/common-x86/default.nix
+++ b/modules/common-x86/default.nix
@@ -1,7 +1,7 @@
-{ inputs, ... }:
+{ custom, inputs }: { ... }:
 {
   imports = [
-    "${inputs.self}/modules/common"
+    (import "${inputs.self}/modules/common" { inherit custom inputs; })
   ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/modules/common/default.nix b/modules/common/default.nix
index b3c6444..854df0a 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,7 +1,7 @@
 { inputs, custom }: { pkgs, ... }:
 {
   imports = [
-    (import "${inputs.self}/modules/cli" { inherit inputs; })
+    "${inputs.self}/modules/cli"
   ];
 
   # The rough location