Devolve home-manager separately

darwin/baseline.nix

@@ -4,6 +4,10 @@
   ...
 }:
 {
+  environment.systemPackages = with pkgs; [
+    hms
+  ];
+
   fonts.packages = with pkgs; [
     dejavu_fonts
     nerd-fonts.hack

home/default.nix

@@ -34,5 +34,5 @@ let
     };
 in
 {
-  inherit ivr;
+  "MacBook-Pro.local" = ivr;
 }

hosts/genesis/networking/dhcp.nix

@@ -103,7 +103,7 @@
           }
           {
             hw-address = "c8:4b:d6:ca:20:8f";
-            ip-address = "10.42.1.10"; # Jude - but maybe through the monitor?
+            ip-address = "10.42.1.10"; # The monitor
           }
           {
             hw-address = "04:7c:16:d5:60:6f";

pkgs/hms/hms.sh

@@ -1,13 +1,38 @@
 # vim: set ft=bash:
-# Build different targets with GUI or not
+
+set -ex -o pipefail
 
 # Build and switch
-user="$(whoami)"
+system="$(uname -s)"
-src="${HOME}/.config/nix"
+
-echo "Building ${user}"
+# Determine where the Flake is
+if [ "$system" == "Darwin" ]; then
+    try_src="/etc/nix-darwin"
+else
+    try_src="/etc/nixos"
+fi
+if [ -d "$try_src" ]; then
+    src="$try_src"
+    target="$(hostname)"
+else
+    src="$HOME/.config/nix"
+    target="$(whoami)"
+fi
+
+# Find the hostname
+echo "Building user for ${target}"
+
+# Build the system
 dest=$(mktemp -d)
+trap cleanup 1 2 3 6 15
+
+function cleanup {
+    echo "Cleaning up"
+    rm -r "${dest}"
+    exit
+}
+
 pushd "${dest}" > /dev/null
-nom build "${src}#homeConfigurations.\"${user}\".activationPackage"
+nom build "${src}#homeConfigurations.\"${target}\".activationPackage"
 ./result/activate
 popd > /dev/null
-rm -r "${dest}"