From 4481acdc7fc89ce1d72175e71bb5e77181f4ba45 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Mon, 14 Aug 2023 16:06:53 -0400
Subject: [PATCH] Add unstable packages to macOS

---
 flake.lock                  |  6 +++---
 modules/darwin/brew.nix     |  1 +
 modules/packages/common.nix |  8 ++++----
 outputs.nix                 | 13 +++++++++++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index a109ddc..55c9844 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1691853136,
-        "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=",
+        "lastModified": 1692007866,
+        "narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0451844bbdf545f696f029d1448de4906c7f753",
+        "rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b",
         "type": "github"
       },
       "original": {
diff --git a/modules/darwin/brew.nix b/modules/darwin/brew.nix
index 8df3dd4..eac616c 100644
--- a/modules/darwin/brew.nix
+++ b/modules/darwin/brew.nix
@@ -25,6 +25,7 @@ in {
       "coreutils"
       "gnu-sed"
       "gnu-tar"
+      "helm"
       "netdata"
       "node"
       "podman"
diff --git a/modules/packages/common.nix b/modules/packages/common.nix
index 1468c35..7c78206 100644
--- a/modules/packages/common.nix
+++ b/modules/packages/common.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  unstable,
   ...
 }: let
   inherit (pkgs) stdenv;
@@ -28,7 +29,7 @@ in {
       bat
       exa
       fd
-      github-cli
+      unstable.github-cli
       progress
       glab
       hadolint
@@ -45,16 +46,15 @@ in {
       tmux-sessionizer
 
       # containers
-      k9s
+      unstable.k9s
       krew
       kube-score
       kubecolor
       kubectl
       kubectx
-      kubernetes-helm
       kustomize
       minikube
-      skaffold
+      unstable.skaffold
       stern
 
       # language servers
diff --git a/outputs.nix b/outputs.nix
index f4bf530..f8cd15b 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -94,9 +94,15 @@
     };
   };
 
-  darwinConfigurations = {
+  darwinConfigurations = let
+    system = "aarch64-darwin";
+    unstable = import nixpkgs-unstable {
+      inherit system;
+    };
+  in {
     zelus = darwin.lib.darwinSystem {
-      system = "aarch64-darwin";
+      inherit system;
+      specialArgs = {inherit unstable;};
 
       modules = [
         home-manager.darwinModules.home-manager
@@ -115,6 +121,9 @@
               useGlobalPkgs = true;
               useUserPackages = true;
               users."dave.gallant".imports = [./home/default.nix];
+              extraSpecialArgs = {
+                inherit unstable;
+              };
             };
           };
         })