From dd73cab0ed1555d0fc3996574ba2726284351faa Mon Sep 17 00:00:00 2001
From: Dave Gallant <dave.gallant@gmail.com>
Date: Fri, 11 Oct 2024 08:48:34 -0400
Subject: [PATCH] Add method to selectively pull packages from master

---
 flake.lock       | 17 +++++++++++++++++
 flake.nix        | 14 ++++++++++++++
 home/default.nix |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 72bcc40..dc6cf5e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -420,6 +420,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1728650607,
+        "narHash": "sha256-0lOnVTzRXzpk5uxbHLm3Ti3tyPAvirAIQDfwEUd8arg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "612ee628421ba2c1abca4c99684862f76cb3b089",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1728538411,
@@ -486,6 +502,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "stylix": "stylix"
diff --git a/flake.nix b/flake.nix
index d131fd6..ec0d1f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     darwin = {
       url = "github:lnl7/nix-darwin";
@@ -27,6 +28,7 @@
       home-manager,
       nixpkgs,
       nixpkgs-unstable,
+      nixpkgs-master,
       nixos-hardware,
       stylix,
       ...
@@ -38,11 +40,16 @@
             system = "x86_64-linux";
             config.allowUnfree = true;
           };
+          master = import nixpkgs-master {
+            system = "x86_64-linux";
+            config.allowUnfree = true;
+          };
         in
         {
           hephaestus = nixpkgs.lib.nixosSystem {
             specialArgs = {
               inherit unstable;
+              inherit master;
             };
             modules = [
               ./fonts.nix
@@ -89,6 +96,7 @@
                       ];
                       extraSpecialArgs = {
                         inherit unstable;
+                        inherit master;
                       };
                     };
                   };
@@ -105,12 +113,17 @@
             config.allowUnfree = true;
             inherit system;
           };
+          master = import nixpkgs-master {
+            config.allowUnfree = true;
+            inherit system;
+          };
         in
         {
           zelus = darwin.lib.darwinSystem {
             inherit system;
             specialArgs = {
               inherit unstable;
+              inherit master;
             };
 
             modules = [
@@ -134,6 +147,7 @@
                       ];
                       extraSpecialArgs = {
                         inherit unstable;
+                        inherit master;
                       };
                     };
                   };
diff --git a/home/default.nix b/home/default.nix
index bde7b22..f99c28a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,6 +2,7 @@
   lib,
   pkgs,
   unstable,
+  master,
   ...
 }:
 let
@@ -550,7 +551,7 @@ in
     firefox = {
       enable = stdenv.isLinux;
 
-      package = pkgs.librewolf;
+      package = master.librewolf;
 
       profiles = {
         default = {