From 47b6f5737ee2a24a7f9a1f9ade0b7b1a6c6ea3e4 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 4 Mar 2024 23:03:47 -0600
Subject: [PATCH] Clean up nix flake check

---
 flake.nix                         | 4 +++-
 hosts/default.nix                 | 2 +-
 hosts/icdm-root/location.nix      | 4 ++--
 hosts/mm/default.nix              | 4 ++--
 hosts/myself/container-runner.nix | 4 ++--
 hosts/myself/default.nix          | 3 +++
 hosts/myself/git.nix              | 8 ++++----
 modules/nixos/container.nix       | 4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 019a845..148529a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,9 @@
 				unstable = self.nixosConfigurations.jude.config.system.build.toplevel;
 				stable   = self.nixosConfigurations.linode.config.system.build.toplevel;
 			};
+			aarch64-linux = {
+				unstable = self.nixosConfigurations.nixos.config.system.build.toplevel;
+			};
 		};
 
 		nixosConfigurations = (import ./hosts { inherit inputs overlays; });
@@ -97,7 +100,6 @@
 
 		overlays = {
 			default = local_overlay;
-			all = overlays;
 		};
 
 		modules = import ./modules;
diff --git a/hosts/default.nix b/hosts/default.nix
index 77d2aad..7511523 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -18,7 +18,7 @@ let
 		};
 	in channel.lib.nixosSystem {
 		inherit system;
-		specialArgs = { inherit nixpkgs inputs; };
+		specialArgs = { inherit nixpkgs inputs overlays; };
 		modules = [
 			{
 				nixpkgs.overlays = overlays;
diff --git a/hosts/icdm-root/location.nix b/hosts/icdm-root/location.nix
index d2d0d72..09339a4 100644
--- a/hosts/icdm-root/location.nix
+++ b/hosts/icdm-root/location.nix
@@ -8,8 +8,8 @@
   i18n.defaultLocale = "en_US.UTF-8";
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "";
+    variant = "";
   };
 }
diff --git a/hosts/mm/default.nix b/hosts/mm/default.nix
index 08f2e15..98c9744 100644
--- a/hosts/mm/default.nix
+++ b/hosts/mm/default.nix
@@ -183,9 +183,9 @@ in
 			};
 		};
 		# Configure keymap in X11
-		xserver = {
+		xserver.xkb = {
 			layout = "us";
-			xkbVariant = "";
+			variant = "";
 		};
 	};
 
diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix
index a4b6b08..0ec8eb9 100644
--- a/hosts/myself/container-runner.nix
+++ b/hosts/myself/container-runner.nix
@@ -1,4 +1,4 @@
-{ inputs, name, extra ? {}, packages ? [] }:
+{ inputs, name, extra ? {}, packages ? [], overlays }:
 
 ({ config, pkgs, lib, ... }:
 let
@@ -15,7 +15,7 @@ lib.attrsets.recursiveUpdate {
 		inputs.self.modules.nixosModule
 	];
 
-	nixpkgs.overlays = inputs.self.overlays.all;
+	nixpkgs.overlays = overlays;
 
 	age = {
 		identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix
index fabcf08..1f848bf 100644
--- a/hosts/myself/default.nix
+++ b/hosts/myself/default.nix
@@ -66,6 +66,9 @@
 				configurationLimit = 10;
 			};
 		};
+		binfmt.emulatedSystems = [
+			"aarch64-linux"
+		];
 	};
 	nixpkgs.config = {
 		allowUnfree = true;
diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix
index 4cd6d5e..cb224c8 100644
--- a/hosts/myself/git.nix
+++ b/hosts/myself/git.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, pkgs, lib, inputs, overlays, ... }:
 
 let
 
@@ -88,7 +88,7 @@ in  {
 		hostAddress = "192.168.201.1";
 		localAddress = "192.168.201.2";
 		config = ((import ./container-runner.nix) {
-			inherit inputs;
+			inherit inputs overlays;
 			name = "qemu";
 			packages = with pkgs; [ qemu_full qemu_kvm ];
 			extra = {
@@ -122,7 +122,7 @@ in  {
 		hostAddress = "192.168.202.1";
 		localAddress = "192.168.202.2";
 		config = ((import ./container-runner.nix) {
-			inherit inputs;
+			inherit inputs overlays;
 			name = "vbox";
 			extra = {
 				systemd.services.gitlab-runner.serviceConfig = {
@@ -148,7 +148,7 @@ in  {
 		hostAddress = "192.168.203.1";
 		localAddress = "192.168.203.2";
 		config = ((import ./container-runner.nix) {
-			inherit inputs;
+			inherit inputs overlays;
 			name = "shell";
 		});
 	};
diff --git a/modules/nixos/container.nix b/modules/nixos/container.nix
index 07b3420..8f17832 100644
--- a/modules/nixos/container.nix
+++ b/modules/nixos/container.nix
@@ -1,4 +1,4 @@
-{ config, lib, inputs, ... }:
+{ config, lib, inputs, overlays, ... }:
 
 let
 	cfg = config.greg.containers;
@@ -23,7 +23,7 @@ let
 				container.builder
 			];
 
-			nixpkgs.overlays = inputs.self.overlays.all;
+			nixpkgs.overlays = overlays;
 
 			networking = {
 				firewall.enable = true;