Move darwin-inject

build-iso.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-beta="${1}"
-
-nix build ".#nixosConfigurations.iso${beta}.config.system.build.isoImage"

darwin.sh

@@ -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

flake.nix

@@ -84,6 +84,7 @@
 					gnutar
 					gzip
 					inject
+					inject-darwin
 					tmux
 					vim
 					xonsh

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.*

nix.conf

@@ -1 +0,0 @@
-experimental-features = nix-command flakes

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;

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}"
+''