From 73a625fa10a71ea36159393cebcf9b187c4e43a0 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Mon, 2 Mar 2026 10:50:33 -0800
Subject: Revert nixos-rebuild-ng to nixos-unstable branch @caladan

---
 flake.nix                 | 20 ++++++++++----------
 hosts/caladan/default.nix |  2 +-
 overlays/default.nix      | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index 11b0516..c1122ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
     # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
     #my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61";
     #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e";
-    nixpkgs-pr495610.url = "github:thiagokokada/nixpkgs/nixos-rebuild-ng-add-env-to-copy-closure";
+    #nixpkgs-pr495610.url = "github:thiagokokada/nixpkgs/nixos-rebuild-ng-add-env-to-copy-closure";
     #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74";
 
     nvidia-patch = {
@@ -54,7 +54,7 @@
     #my-nixpkgs,
     nixos-hardware,
     nixpkgs-master,
-    nixpkgs-pr495610,
+    #nixpkgs-pr495610,
     nixpkgs-stable,
     #nixpkgs-wine9_22,
     nixpkgs,
@@ -98,14 +98,14 @@
       caladan = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs outputs; };
         modules = [
-          ({ config, pkgs, ... }:
-            let
-              overlay-nixos-rebuild-ng-pr495610 = final: prev: {
-                nixos-rebuild-ng = nixpkgs-pr495610.legacyPackages."x86_64-linux".nixos-rebuild-ng;
-              };
-            in {
-              nixpkgs.overlays = [ overlay-nixos-rebuild-ng-pr495610 ];
-          })
+          #({ config, pkgs, ... }:
+          #  let
+          #    overlay-nixos-rebuild-ng-pr495610 = final: prev: {
+          #      nixos-rebuild-ng = nixpkgs-pr495610.legacyPackages."x86_64-linux".nixos-rebuild-ng;
+          #    };
+          #  in {
+          #    nixpkgs.overlays = [ overlay-nixos-rebuild-ng-pr495610 ];
+          #})
           #({ config, pkgs, ... }:
           #  let
           #    overlay-my-nixpkgs = final: prev: {
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 04d64f9..c82c1f4 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -140,7 +140,7 @@
       outputs.overlays.modifications
       outputs.overlays.master-packages
       #outputs.overlays.my-nixpkgs-packages
-      outputs.overlays.pr495610-packages
+      #outputs.overlays.pr495610-packages
       outputs.overlays.stable-packages
       #outputs.overlays.wine9_22-packages
     ];
diff --git a/overlays/default.nix b/overlays/default.nix
index e05c515..220632b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -91,12 +91,12 @@
   #  };
   #};
 
-  pr495610-packages = final: _prev: {
-    pr495610 = import inputs.nixpkgs-pr495610 {
-      inherit (final) system;
-      config.allowUnfree = true;
-    };
-  };
+  #pr495610-packages = final: _prev: {
+  #  pr495610 = import inputs.nixpkgs-pr495610 {
+  #    inherit (final) system;
+  #    config.allowUnfree = true;
+  #  };
+  #};
 
   # When applied, the stable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.stable'
-- 
cgit v1.2.3