From 5208ff8b7ec7abc34aab6a10195f8df37304a0f1 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Thu, 22 Jul 2021 20:03:48 +0200
Subject: [PATCH] override nixpkgs inputs

---
 flake.lock | 55 ++++++++++--------------------------------------------
 flake.nix  | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7e60aee..22a267e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -175,7 +175,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1626841047,
@@ -205,7 +207,9 @@
         "explain-pause-mode": "explain-pause-mode",
         "flake-utils": "flake-utils_2",
         "nix-straight": "nix-straight",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nose": "nose",
         "ob-racket": "ob-racket",
         "org-mode": "org-mode",
@@ -262,34 +266,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1626046891,
-        "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=",
-        "path": "/nix/store/hv23pdsi6n7z96pkljv25lfrfh1mnzz7-source",
-        "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1624561540,
-        "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1626852498,
         "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
@@ -305,19 +281,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1626046891,
-        "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=",
-        "path": "/nix/store/hv23pdsi6n7z96pkljv25lfrfh1mnzz7-source",
-        "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "nose": {
       "flake": false,
       "locked": {
@@ -337,7 +300,9 @@
     "nvd": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1625773975,
@@ -441,7 +406,7 @@
         "home-manager": "home-manager",
         "nix-doom-emacs": "nix-doom-emacs",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "nvd": "nvd"
       }
     },
diff --git a/flake.nix b/flake.nix
index da37caa..692e5a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,26 @@
   description = "dadada's nix flake";
 
   inputs = {
-    emacs-overlay.url = github:nix-community/emacs-overlay;
+    emacs-overlay = {
+      url = github:nix-community/emacs-overlay;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils.url = github:numtide/flake-utils;
-    home-manager.url = github:nix-community/home-manager;
+    home-manager = {
+      url = github:nix-community/home-manager;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nix-doom-emacs = {
       url = github:vlaci/nix-doom-emacs;
       inputs.emacs-overlay.follows = "emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = github:NixOS/nixos-hardware/master;
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
-    nvd.url = git+https://gitlab.com/dadada_/nvd.git?ref=init-flake;
+    nvd = {
+      url = git+https://gitlab.com/dadada_/nvd.git?ref=init-flake;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { ... } @ args: import ./outputs.nix args;