From b2b99f12cce6504dec497e70d4cd8b8418228aab Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Thu, 10 Apr 2025 16:01:08 -0700
Subject: [PATCH] [flake] Move MCP back to 24.11 for stability.  Probably move
 the rest soon too.

---
 flake.lock | 62 ++++++++++++++++++++++++++++++------------------------
 flake.nix  | 25 +++++++++-------------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index a4d7064..b2a8547 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,7 +74,7 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ]
       },
       "locked": {
@@ -181,7 +181,7 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
@@ -373,27 +373,6 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743496612,
-        "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "73d59580d01e9b9f957ba749f336a272869c42dd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "nix-filter": {
       "locked": {
         "lastModified": 1693833173,
@@ -411,11 +390,39 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743583204,
+        "lastModified": 0,
         "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+        "path": "/nix/store/fwhfa9pbx8vdi8nd5pcys665baz6xdxf-source",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1744168086,
+        "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
+        "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
         "type": "github"
       },
       "original": {
@@ -453,8 +460,9 @@
         "home-manager": "home-manager",
         "hy3": "hy3",
         "hyprland": "hyprland",
-        "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
         "split-monitor-workspaces": "split-monitor-workspaces"
       }
@@ -462,7 +470,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 361134f..bd24d1d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,19 @@
   description = "System Configuration";
 
   inputs = {
-    nixpkgs = {
+    nixpkgs-unstable = {
       url = "github:nixos/nixpkgs?ref=nixos-unstable";
     };
+    nixpkgs-stable = {
+      url = "github:nixos/nixpkgs?ref=nixos-24.11";
+    };
     home-manager = {
       url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     hyprland = {
       url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     hy3 = {
       url = "github:outfoxxed/hy3";
@@ -21,13 +24,9 @@
       url = "github:Duckonaut/split-monitor-workspaces";
       inputs.hyprland.follows = "hyprland";
     };
-    nix-darwin = {
-      url = "github:LnL7/nix-darwin/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
     };
   };
 
@@ -38,23 +37,19 @@
         altair = (import ./system/hosts/altair) {
           inherit inputs;
           inherit self;
-          inherit nixpkgs;
+          nixpkgs = inputs.nixpkgs-unstable;
         };
         mcp = (import ./system/hosts/mcp) {
           inherit inputs;
           inherit self;
-          inherit nixpkgs;
+          nixpkgs = inputs.nixpkgs-stable;
         };
         vega = (import ./system/hosts/vega) {
           inherit inputs;
           inherit self;
-          inherit nixpkgs;
+          nixpkgs = inputs.nixpkgs-unstable;
         };
       };
-      darwinConfigurations = {
-        # Removed.  See 133a3f82073f03e62cb3e7902c85fb3fc6292fe2 for when the
-        # last one was removed.
-      };
       features = {
         development = (import ./home-manager/features/development/development.nix);
       };