From a73f16ddf9a5c1a236b2ffbabbc6d7eedce2a33c Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Tue, 5 Jul 2022 21:33:47 +0530
Subject: [PATCH] Remove nixpkgs-unstable

Also remove cachix cache for nixpkgs-unstable.

Turns out I am not using any of this on WSL, so doesn't make any sense to keep
it around.
---
 cachix/nixpkgs-unfree.nix | 11 -----------
 flake.lock                | 25 ++-----------------------
 flake.nix                 |  6 ++----
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 cachix/nixpkgs-unfree.nix

diff --git a/cachix/nixpkgs-unfree.nix b/cachix/nixpkgs-unfree.nix
deleted file mode 100644
index 6ed7cab..0000000
--- a/cachix/nixpkgs-unfree.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-
-{
-  nix.settings = {
-    substituters = [
-      "https://nixpkgs-unfree.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
-    ];
-  };
-}
diff --git a/flake.lock b/flake.lock
index 592553e..5867abb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -129,7 +129,7 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -147,26 +147,6 @@
       }
     },
     "nixpkgs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1653662045,
-        "narHash": "sha256-pTn2FPLsaHMWcP442jTN30YQZlO9K9VbWjkK6u++Q1g=",
-        "owner": "numtide",
-        "repo": "nixpkgs-unfree",
-        "rev": "d9e8ab22f97457284c676885bc874f2fa8552ea4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixpkgs-unfree",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1656753965,
         "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@@ -189,8 +169,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index 8bd6e30..6d06da4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,12 @@
   description = "NixOS configuration (flake edition)";
 
   inputs = {
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs = {
-      url = "github:numtide/nixpkgs-unfree";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      url = "github:nixos/nixpkgs/nixos-unstable";
     };
     nixos-wsl = {
       url = "github:nix-community/NixOS-WSL";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
       url = "github:nix-community/home-manager";