Correct arguments for common

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} ]; }

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} ]; }

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.

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