From e47deebca298b65be6bf2bc164d3eba300dd7e95 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Mon, 1 Mar 2021 22:44:34 +0000
Subject: [PATCH] pkgs.extend() and cleanup!

Preparing for the screenstub overlay.
---
 config/common/default.nix            |  1 -
 config/users/kat/desktop.nix         |  2 --
 config/users/kat/firefox/default.nix |  4 +---
 nix/sources.json                     | 18 +++++++++---------
 pkgs/default.nix                     | 27 +++++++++++----------------
 5 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/config/common/default.nix b/config/common/default.nix
index befbf069..3aff6fbb 100644
--- a/config/common/default.nix
+++ b/config/common/default.nix
@@ -2,7 +2,6 @@
 
 let
   sources = import ../../nix/sources.nix;
-  unstable = import sources.nixpkgs-unstable { };
 in {
   imports = [ ../../modules ../users (sources.home-manager + "/nixos") ];
 
diff --git a/config/users/kat/desktop.nix b/config/users/kat/desktop.nix
index de748953..6577ac2f 100644
--- a/config/users/kat/desktop.nix
+++ b/config/users/kat/desktop.nix
@@ -2,8 +2,6 @@
 
 let
   sources = import ../../../nix/sources.nix;
-  unstable = import sources.nixpkgs-unstable { inherit (pkgs) config; };
-  nur = import sources.NUR;
 in {
   imports = [ ./firefox ];
 
diff --git a/config/users/kat/firefox/default.nix b/config/users/kat/firefox/default.nix
index 3d74934a..c4907f5c 100644
--- a/config/users/kat/firefox/default.nix
+++ b/config/users/kat/firefox/default.nix
@@ -2,8 +2,6 @@
 
 let
   sources = import ../../../../nix/sources.nix;
-  unstable = import sources.nixpkgs-unstable { inherit (pkgs) config; };
-  nur = import sources.NUR { inherit pkgs; };
   commonSettings = {
     "app.update.auto" = false;
     "identity.fxaccounts.account.device.name" = config.networking.hostName;
@@ -24,7 +22,7 @@ in {
 
     programs.firefox = {
       enable = true;
-      extensions = with nur.repos.rycee.firefox-addons; [
+      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         auto-tab-discard
         bitwarden
         darkreader
diff --git a/nix/sources.json b/nix/sources.json
index 1e3ed3fb..610d686f 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://nur.nix-community.org/",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f88a3283cad55888be0cc2d984a44801dd16ec21",
-        "sha256": "0kgs39spdlwj4ky4v3sd7drlvhjg4wccara7g9axa6la8328ghc2",
+        "rev": "43f5287f2cf6f045c4fe5c6c84df25aa609f65f0",
+        "sha256": "19gx1vrpg65hmga6rnazrz50i3frffyaxa909zpvri4frrf29lrx",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/f88a3283cad55888be0cc2d984a44801dd16ec21.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/43f5287f2cf6f045c4fe5c6c84df25aa609f65f0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "arc-nixexprs": {
@@ -74,10 +74,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d303eee16ce8dee5c0b5b8e5f6323f561c189ec5",
-        "sha256": "05hna2a2zss5rfbsbxah4z159yvyyarw5w5hqwnbs020h02j2ywh",
+        "rev": "df8e3bd110921621d175fad88c9e67909b7cb3d3",
+        "sha256": "1z20y0lblb452h2gghgds34g7lrj7v8gfhz66w687ws8jqdm3bzz",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/d303eee16ce8dee5c0b5b8e5f6323f561c189ec5.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/df8e3bd110921621d175fad88c9e67909b7cb3d3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {
@@ -98,10 +98,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "74b9241e60c796ff68876f87916062d54c4aa0f5",
-        "sha256": "03ibycl3jzv51flcfqq24xvk9dcdfy5nhmqa801083y56x4szqyj",
+        "rev": "77e75f1ed1db9c658cb63ca253b84b13551f9ef8",
+        "sha256": "044kl1d7w300l97iivqb3774ig0hn5z6h1y3abvqa10mjq67382k",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/74b9241e60c796ff68876f87916062d54c4aa0f5.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/77e75f1ed1db9c658cb63ca253b84b13551f9ef8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "pbb-nixfiles": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 59592a87..cc788996 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,29 +4,24 @@ let
   sources = import ../nix/sources.nix;
   pkgs = import sources.nixpkgs args;
 
-  callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
-
-  newpkgs = {
-    dino = callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
-      inherit (pkgs) dino;
+  overlay = self: super: {
+    dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
+      inherit (super) dino;
     };
 
-    discord = pkgs.discord.override { nss = pkgs.nss_latest; };
+    discord = super.discord.override { nss = self.nss_latest; };
 
-    arc = import sources.arc-nixexprs { inherit pkgs; };
-    unstable = import sources.nixpkgs-unstable { inherit pkgs; };
-    nur = import sources.NUR { inherit pkgs; };
+    arc = import sources.arc-nixexprs { pkgs = super; };
+    unstable = import sources.nixpkgs-unstable { inherit (self) config; };
+    nur = import sources.NUR { nurpkgs = self; pkgs = self; };
 
     linuxPackagesFor = kernel:
-      (pkgs.linuxPackagesFor kernel).extend (_: ksuper: {
+      (super.linuxPackagesFor kernel).extend (_: ksuper: {
         vendor-reset =
-          (callPackage ./vendor-reset { kernel = ksuper.kernel; }).out;
+          (super.callPackage ./vendor-reset { kernel = ksuper.kernel; }).out;
       });
 
-    colorhelpers = import ../lib/colorhelpers.nix { inherit (pkgs) lib; };
-
-    inherit callPackage;
-    appendOverlays = overlays: (pkgs.appendOverlays overlays) // newpkgs;
+    colorhelpers = import ../lib/colorhelpers.nix { inherit (self) lib; };
   };
 
-in pkgs // newpkgs
+in pkgs.extend(overlay)
\ No newline at end of file