From cad9e0cfd32fd90de8893d8625e1ce8ec0e53cca Mon Sep 17 00:00:00 2001
From: Chris Dombroski <cdombroski@gmail.com>
Date: Tue, 12 Nov 2024 22:17:20 -0500
Subject: [PATCH] reverse follows flow

---
 flake.lock | 50 ++++++++++++++++++++++++--------------------------
 flake.nix  | 12 +++++++++---
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 387dc74..59676b7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -304,8 +304,12 @@
     "nixos-cosmic": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs": [
+          "nixunstable"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -339,22 +343,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
       "locked": {
         "lastModified": 1731239293,
         "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
@@ -370,6 +358,22 @@
         "type": "github"
       }
     },
+    "nixunstable": {
+      "locked": {
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "deploy-rs": "deploy-rs",
@@ -381,14 +385,8 @@
         "impermanence": "impermanence",
         "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": [
-          "nixos-cosmic",
-          "nixpkgs-stable"
-        ],
-        "nixunstable": [
-          "nixos-cosmic",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs",
+        "nixunstable": "nixunstable",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
diff --git a/flake.nix b/flake.nix
index 08302ba..c8dad78 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,15 @@
 {
   description = "Chris's system configuration";
   inputs = {
-    nixpkgs.follows = "nixos-cosmic/nixpkgs-stable";
-    nixunstable.follows = "nixos-cosmic/nixpkgs";
-    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixunstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs = {
+        nixpkgs-stable.follows = "nixpkgs";
+        nixpkgs.follows = "nixunstable";
+      };
+    };
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";