From a3d29a1627e9dec790f874053c2d9ffe63649514 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 27 Nov 2024 23:27:16 +0000
Subject: [PATCH] feat: update to the nh beta which introduce darwin support

---
 flake.lock                        |  6 +++---
 home/comfy/system/env.nix         |  1 +
 home/isabel/system/env.nix        |  1 +
 justfile                          | 10 +++++++++-
 modules/base/environment/vars.nix |  1 +
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 294d8927b..44e6dbd59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -100,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732668173,
-        "narHash": "sha256-asrUSh8JPz8VGX4fojJD61IbWjpsCVPB8iBEOJ2WWOc=",
+        "lastModified": 1732749315,
+        "narHash": "sha256-lHIkEeLaxgaOUs2m6JWaCnUpBFd6HglfDXmkkmz6rPE=",
         "owner": "isabelroses",
         "repo": "beapkgs",
-        "rev": "b719e8f4f151a36ac46410a56518d2f89bc17fdb",
+        "rev": "0b3f67348f3a75153a6dd2ff9de99aa4b046bd43",
         "type": "github"
       },
       "original": {
diff --git a/home/comfy/system/env.nix b/home/comfy/system/env.nix
index d9becf9ce..ff5fc0f0c 100644
--- a/home/comfy/system/env.nix
+++ b/home/comfy/system/env.nix
@@ -25,6 +25,7 @@ in
       SYSTEMD_PAGERSECURE = "true";
       PAGER = "less -FR";
       FLAKE = osConfig.garden.environment.flakePath;
+      NH_FLAKE = osConfig.garden.environment.flakePath;
     };
   };
 }
diff --git a/home/isabel/system/env.nix b/home/isabel/system/env.nix
index d9becf9ce..ff5fc0f0c 100644
--- a/home/isabel/system/env.nix
+++ b/home/isabel/system/env.nix
@@ -25,6 +25,7 @@ in
       SYSTEMD_PAGERSECURE = "true";
       PAGER = "less -FR";
       FLAKE = osConfig.garden.environment.flakePath;
+      NH_FLAKE = osConfig.garden.environment.flakePath;
     };
   };
 }
diff --git a/justfile b/justfile
index fc78fc73a..7344cae32 100644
--- a/justfile
+++ b/justfile
@@ -2,12 +2,20 @@
 default:
   @just --list --unsorted
 
-# setup our nixos and darwin builder
+# setup our nixos builder
 [private]
+[linux]
 [group('rebuild')]
 builder goal *args:
   nh os {{goal}} -- {{args}}
 
+# setup our darwin builder
+[private]
+[macos]
+[group('rebuild')]
+builder goal *args:
+  nh darwin {{goal}} -- {{args}}
+
 # we have this setup incase i ever want to go back and use the old stuff
 [private]
 [linux]
diff --git a/modules/base/environment/vars.nix b/modules/base/environment/vars.nix
index bbe1bd100..f0d931d73 100644
--- a/modules/base/environment/vars.nix
+++ b/modules/base/environment/vars.nix
@@ -12,5 +12,6 @@
 
     # Some programs like `nh` use the FLAKE env var to determine the flake path
     FLAKE = config.garden.environment.flakePath;
+    NH_FLAKE = config.garden.environment.flakePath;
   };
 }