From f651241f202040bc4552abfdf8604a7b2e905710 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Wed, 19 Nov 2025 23:46:11 -0500
Subject: [PATCH] Remove the pkgs-unoptimized input to instead import regular
 nixpkgs.

---
 nix/configuration/flake.lock                  | 19 +---------------
 nix/configuration/flake.nix                   | 22 +++++++++++--------
 .../roles/optimized_build/default.nix         |  3 +--
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock
index cfc777e..9f94596 100644
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -167,22 +167,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-unoptimized": {
-      "locked": {
-        "lastModified": 1762977756,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -215,8 +199,7 @@
         "disko": "disko",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unoptimized": "nixpkgs-unoptimized"
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-overlay": {
diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix
index 8da52e8..af0ac6d 100644
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -20,7 +20,6 @@
   inputs = {
     impermanence.url = "github:nix-community/impermanence";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-unoptimized.url = "github:NixOS/nixpkgs/nixos-unstable";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -35,7 +34,6 @@
     {
       self,
       nixpkgs,
-      nixpkgs-unoptimized,
       disko,
       impermanence,
       lanzaboote,
@@ -69,12 +67,6 @@
             this_nixos_config = self.nixosConfigurations."${hostname}";
 
             all_nixos_configs = self.nixosConfigurations;
-
-            pkgs-unoptimized = import nixpkgs-unoptimized {
-              inherit (nodeConfig) system;
-              hostPlatform.gcc.arch = "default";
-              hostPlatform.gcc.tune = "default";
-            };
           };
           modules = [
             impermanence.nixosModules.impermanence
@@ -84,7 +76,19 @@
             (./. + "/hosts/${hostname}")
             (./. + "/formats/${format}.nix")
             {
-              config.nixpkgs.hostPlatform.system = nodeConfig.system;
+              config = {
+                nixpkgs.hostPlatform.system = nodeConfig.system;
+                nixpkgs.overlays = [
+                  (final: prev: {
+                    # stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}";
+                    unoptimized = import nixpkgs {
+                      system = prev.stdenv.hostPlatform.system;
+                      hostPlatform.gcc.arch = "default";
+                      hostPlatform.gcc.tune = "default";
+                    };
+                  })
+                ];
+              };
             }
           ];
         }
diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix
index 4b35549..f2fe9e6 100644
--- a/nix/configuration/roles/optimized_build/default.nix
+++ b/nix/configuration/roles/optimized_build/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  pkgs-unoptimized,
   ...
 }:
 
@@ -98,7 +97,7 @@
               }
             )
             (final: prev: {
-              inherit (pkgs-unoptimized)
+              inherit (final.unoptimized)
                 assimp
                 binaryen
                 gsl