From 44623b5979f375dc565134a0f7b2a47440517b13 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Tue, 16 Mar 2021 22:52:28 -0600
Subject: [PATCH] nix: don't use nix flake

I originally wanted to use the nix flake to allow users to take
advantage of the latest changes. Just so happened that nixpkgs was
recently updated with a new version around the same time, and this
just adds complexity for no real gain.
---
 extern/default.nix |  1 -
 flake.lock         | 20 --------------------
 flake.nix          |  3 +--
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/extern/default.nix b/extern/default.nix
index ecfffcd6..8a4e36f8 100644
--- a/extern/default.nix
+++ b/extern/default.nix
@@ -9,7 +9,6 @@ in
   ];
 
   overlays = [
-    nix.overlay
     nur.overlay
     devshell.overlay
     (final: prev: {
diff --git a/flake.lock b/flake.lock
index 2d3c1316..f36841e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,25 +152,6 @@
         "type": "github"
       }
     },
-    "nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1615911544,
-        "narHash": "sha256-2V0qJ9EaPjOetEzEx0vxP+dxKOX8ZXJi7PIlLjkxymA=",
-        "owner": "NixOS",
-        "repo": "nix",
-        "rev": "66fa1c7375e4b3073a16df4678cf1d37446ed20b",
-        "type": "github"
-      },
-      "original": {
-        "id": "nix",
-        "type": "indirect"
-      }
-    },
     "nixos": {
       "locked": {
         "lastModified": 1615797423,
@@ -270,7 +251,6 @@
         "flake-compat": "flake-compat",
         "home": "home",
         "naersk": "naersk",
-        "nix": "nix",
         "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index 9bb833dd..aa89c77b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,14 +22,13 @@
       home.inputs.nixpkgs.follows = "nixos";
       naersk.url = "github:nmattia/naersk";
       naersk.inputs.nixpkgs.follows = "override";
-      nix.inputs.nixpkgs.follows = "nixos";
       nixos-hardware.url = "github:nixos/nixos-hardware";
       utils.url = "github:numtide/flake-utils/flatten-tree-system";
       pkgs.url = "path:./pkgs";
       pkgs.inputs.nixpkgs.follows = "nixos";
     };
 
-  outputs = inputs@{ deploy, nixos, nur, nix, self, utils, ... }:
+  outputs = inputs@{ deploy, nixos, nur, self, utils, ... }:
     let
       inherit (self) lib;
       inherit (lib) os;