From 7d53e68a363801c921832589a0fdccba3b462e9c Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 22 Jan 2024 13:34:35 -0600
Subject: [PATCH] Add flake checks and hopefully fix home-assitant

---
 flake.nix            | 44 ++++++++++++++++++++++++++++----------------
 garnix.yaml          |  5 +++--
 overlays/default.nix |  6 +++++-
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index f45d8e0..ec04236 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,32 +60,44 @@
 		];
 
 	in {
+		checks = {
+			x86_64-linux = {
+				unstable = self.nixosConfigurations.jude.config.system.build.toplevel;
+				stable   = self.nixosConfigurations.linode.config.system.build.toplevel;
+			};
+		};
+
 		nixosConfigurations = (import ./hosts { inherit inputs overlays; });
 
 		darwinConfigurations = (import ./darwin { inherit inputs overlays; });
 
 		homeConfigurations = (import ./home { inherit inputs overlays; });
 
-		devShell = (flake-utils.lib.eachSystemMap flake-utils.lib.allSystems (system: let
+		devShells = (flake-utils.lib.eachSystemMap flake-utils.lib.allSystems (system: let
 			pkgs = import nixunstable { inherit system overlays; };
-		in pkgs.mkShell {
-			buildInputs = with pkgs; [
-				bashInteractive
-				curl
-				git
-				gnutar
-				gzip
-				inject
-				tmux
-				vim
-				xonsh
-			];
+		in {
+			default = pkgs.mkShell {
+				buildInputs = with pkgs; [
+					bashInteractive
+					curl
+					git
+					gnutar
+					gzip
+					inject
+					tmux
+					vim
+					xonsh
+				];
+			};
 		}));
 
 		overlays = { default = local_overlay; };
-		packages = (import ./overlays/packages.nix { inherit nixunstable flake-utils; });
-		defaultPackage = {
-			x86_64-linux = self.nixosConfigurations.iso-beta.config.system.build.isoImage;
+		packages = {
+			x86_64-linux = rec {
+				default = iso;
+				iso = self.nixosConfigurations.iso.config.system.build.isoImage;
+				iso-beta = self.nixosConfigurations.iso.config.system.build.isoImage;
+			};
 		};
 	};
 }
diff --git a/garnix.yaml b/garnix.yaml
index 531ec88..dccf8ab 100644
--- a/garnix.yaml
+++ b/garnix.yaml
@@ -1,7 +1,8 @@
 builds:
   include:
     - darwinConfigurations.*
-    - devShell.x86_64-linux
-    - devShell.aarch64-linux
+    - devShells.x86_64-linux.default
+    - devShells.aarch64-linux.default
+    - devShells.x86_64-darwin.default
     - homeConfigurations.greghellings.activationPackage
     - nixosConfigurations.*
diff --git a/overlays/default.nix b/overlays/default.nix
index 511f4f2..33441eb 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -26,7 +26,7 @@ let
 
 	buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon;
 
-	is2405 = prev.lib.versionAtLeast prev.lib.version "24.05";
+	is2405 = prev.lib.versionAtLeast prev.lib.version "24";
 
 in rec {
 	gregpy = myPython;
@@ -40,6 +40,10 @@ in rec {
 			xonsh-apipenv = cp ./xonsh-apipenv.nix {};
 			xonsh-direnv = cp ./xonsh-direnv.nix {};
 			xontrib-vox = cp ./xonsh-vox.nix {};
+
+			home-assistant-chip-core = python-prev.home-assistant-chip-core.override {
+				openssl_1_1 = final.openssl;
+			};
 		})
 	];