.

machines/aule/configuration.nix

@@ -1,2 +1,3 @@
 { ... }: {
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

machines/default.nix

@@ -0,0 +1,9 @@
+{baseNixosModules, lib, sharedContext, ...}: {
+  clan =
+    (import ../clan.nix {
+      inherit baseNixosModules lib;
+    })
+    // {
+      specialArgs = sharedContext;
+    };
+}

machines/mandos/configuration.nix

@@ -5,6 +5,8 @@
     ./hardware.nix
   ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   sneeuwvlok = {
     hardware.has = {
       gpu.nvidia = true;
@@ -28,4 +30,4 @@
   };
 
   system.stateVersion = "23.11";
-}
+}

machines/mandos/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  imports = [ ./configuration.nix ];
-}

machines/mandos/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, system, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
 in
@@ -13,6 +13,6 @@ in
     extraModulePackages = [ ];
   };
 
-  nixpkgs.hostPlatform = mkDefault system;
+  nixpkgs.hostPlatform = mkDefault pkgs.stdenv.hostPlatform.system;
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/manwe/configuration.nix

@@ -4,6 +4,8 @@
     ./hardware.nix
   ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   system.activationScripts.remove-gtkrc.text = "rm -f /home/chris/.gtkrc-2.0";
 
   services.logrotate.checkConfig = false;

machines/manwe/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  imports = [ ./configuration.nix ];
-}

machines/manwe/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, system, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
 in
@@ -13,6 +13,6 @@ in
     extraModulePackages = [ ];
   };
 
-  nixpkgs.hostPlatform = mkDefault system;
+  nixpkgs.hostPlatform = mkDefault pkgs.stdenv.hostPlatform.system;
   hardware.cpu.amd.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/melkor/configuration.nix

@@ -1,2 +1,3 @@
 { ... }: {
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

machines/orome/configuration.nix

@@ -4,6 +4,8 @@
     ./hardware.nix
   ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   environment.systemPackages = with pkgs; [
     azure-cli
     github-copilot-cli

machines/orome/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  imports = [ ./configuration.nix ];
-}

machines/orome/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, system, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
 in
@@ -13,6 +13,6 @@ in
     extraModulePackages = [ ];
   };
 
-  nixpkgs.hostPlatform = mkDefault system;
+  nixpkgs.hostPlatform = mkDefault pkgs.stdenv.hostPlatform.system;
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/tulkas/configuration.nix

@@ -5,6 +5,8 @@
     ./hardware.nix
   ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   sneeuwvlok = {
     hardware.has = {
       gpu.amd = true;

machines/tulkas/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  imports = [ ./configuration.nix ];
-}

machines/tulkas/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, system, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
 in
@@ -13,6 +13,6 @@ in
     extraModulePackages = [ ];
   };
 
-  nixpkgs.hostPlatform = mkDefault system;
+  nixpkgs.hostPlatform = mkDefault pkgs.stdenv.hostPlatform.system;
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/ulmo/configuration.nix

@@ -4,6 +4,8 @@
     ./hardware.nix
   ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   networking = {
     interfaces.enp2s0 = {
       ipv6.addresses = [

machines/ulmo/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  imports = [ ./configuration.nix ];
-}

machines/ulmo/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, system, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
 in
@@ -13,6 +13,6 @@ in
     extraModulePackages = [ ];
   };
 
-  nixpkgs.hostPlatform = mkDefault system;
+  nixpkgs.hostPlatform = mkDefault pkgs.stdenv.hostPlatform.system;
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/varda/configuration.nix

@@ -1,2 +1,3 @@
 { ... }: {
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

machines/yavanna/configuration.nix

@@ -1,2 +1,3 @@
 { ... }: {
+  nixpkgs.hostPlatform = "x86_64-linux";
 }