From fbd8a70102641f1a7d81366a788f51bfee0c81ad Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Mon, 10 Oct 2022 17:19:57 -0700
Subject: [PATCH] flake: plumb my nixpkgs through to dependencies

---
 flake.lock | 20 +++-----------------
 flake.nix  | 11 ++++++++---
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index a1f6982c0..b3583b669 100644
--- a/flake.lock
+++ b/flake.lock
@@ -98,22 +98,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1665197809,
-        "narHash": "sha256-dRUzv/zNYV2EYtnxFG31pPBk0nErT+MBTu6ZJHm1o2A=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7b06206fa24198912cea58de690aa4943f238fbf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -126,7 +110,9 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 6f177ecf7..6e88857af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,9 +14,14 @@
       url = "github:nix-community/home-manager/release-22.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # TODO: set these up to follow our nixpkgs?
-    sops-nix.url = "github:Mic92/sops-nix";
-    impermanence.url = "github:nix-community/impermanence";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    impermanence = {
+      url = "github:nix-community/impermanence";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence }: