From 31d0783d43fadc81cd53e82f9ab0d396f0881eb5 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 19 Feb 2024 11:10:49 -0600
Subject: [PATCH] Move darwin-inject

---
 build-iso.sh               |  5 -----
 darwin.sh                  | 22 ----------------------
 flake.nix                  |  1 +
 garnix.yaml                |  9 ++++-----
 nix.conf                   |  1 -
 overlays/default.nix       |  5 +++--
 overlays/inject-darwin.nix | 32 ++++++++++++++++++++++++++++++++
 7 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100755 build-iso.sh
 delete mode 100644 darwin.sh
 delete mode 100644 nix.conf
 create mode 100644 overlays/inject-darwin.nix

diff --git a/build-iso.sh b/build-iso.sh
deleted file mode 100755
index 2cd9c7d..0000000
--- a/build-iso.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-beta="${1}"
-
-nix build ".#nixosConfigurations.iso${beta}.config.system.build.isoImage"
diff --git a/darwin.sh b/darwin.sh
deleted file mode 100644
index 0bd50b0..0000000
--- a/darwin.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-set -o pipefail
-
-dir="$(mktemp -d)"
-cd "${dir}"
-
-# Install nix-darwin
-nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-./result/bin/darwin-installer
-
-# Get my configuration
-mkdir -p ~/.config/darwin
-cd ~/.config/darwin
-curl -O -L https://github.com/greg-hellings/nixos-config/archive/refs/heads/main.tar.gz
-tar xvzf main.tar.gz --strip-components 1
-
-# Build NixOS for this system
-cd "${dir}"
-nix build "~/.config/darwin#darwinConfigurations.$(hostname -s).system"
-./result/sw/bin/darwin-rebuild switch --flake ~/.config/darwin
diff --git a/flake.nix b/flake.nix
index 115fe99..5bec348 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,6 +84,7 @@
 					gnutar
 					gzip
 					inject
+					inject-darwin
 					tmux
 					vim
 					xonsh
diff --git a/garnix.yaml b/garnix.yaml
index dccf8ab..252ca08 100644
--- a/garnix.yaml
+++ b/garnix.yaml
@@ -1,8 +1,7 @@
 builds:
+  exclude: []
   include:
-    - darwinConfigurations.*
-    - devShells.x86_64-linux.default
-    - devShells.aarch64-linux.default
-    - devShells.x86_64-darwin.default
-    - homeConfigurations.greghellings.activationPackage
+    - darwinConfigurations.*.system
+    - devShells.*.default
+    - homeConfigurations.*
     - nixosConfigurations.*
diff --git a/nix.conf b/nix.conf
deleted file mode 100644
index c7d7291..0000000
--- a/nix.conf
+++ /dev/null
@@ -1 +0,0 @@
-experimental-features = nix-command flakes
diff --git a/overlays/default.nix b/overlays/default.nix
index f1d5b97..0a660f9 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -51,10 +51,12 @@ in rec {
 	aacs = prev.callPackage ./aacs.nix {};
 	configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
 	create_ssl = prev.callPackage ./create_ssl.nix {};
+	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	hms = prev.callPackage ./hms {
 		pkgs = final.pkgs;
 	};
-	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
+	inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
+	inject-darwin = prev.callPackage ./inject-darwin.nix { inherit (final) pkgs; };
 	setup-ssh = prev.callPackage ./setup-ssh {
 		pkgs = final.pkgs;
 	};
@@ -71,7 +73,6 @@ in rec {
 			postFetch = "rm $out/tests/demo/doc/ma*ana.txt";
 		};
 	}) else prev.copier);
-	inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
 	libbluray-custom = prev.libbluray.override {
 		withAACS = true;
 		withBDplus = true;
diff --git a/overlays/inject-darwin.nix b/overlays/inject-darwin.nix
new file mode 100644
index 0000000..baf6a45
--- /dev/null
+++ b/overlays/inject-darwin.nix
@@ -0,0 +1,32 @@
+{
+	pkgs,
+	coreutils,
+	curl,
+	gnutar,
+	nix,
+	...
+}:
+pkgs.writeShellScriptBin "inject-darwin" ''
+set -ex
+set -o pipefail
+
+dir="$(${coreutils}/bin/mktemp -d)"
+cd "''${dir}"
+
+# Install nix-darwin
+${nix}/bin/nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
+./result/bin/darwin-installer
+
+# Get my configuration
+mkdir -p ~/.config/darwin
+cd ~/.config/darwin
+${curl}/bin/curl -O -L https://github.com/greg-hellings/nixos-config/archive/refs/heads/main.tar.gz
+${gnutar}/bin/tar xvzf main.tar.gz --strip-components 1
+
+# Build NixOS for this system
+pushd "''${dir}"
+${nix}/bin/nix build "~/.config/darwin#darwinConfigurations.$(hostname -s).system"
+./result/sw/bin/darwin-rebuild switch --flake ~/.config/darwin
+popd
+rm -r "''${dir}"
+''