From 5e8c297d03af44d41cd8e8bd6f1400b269e48f52 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Fri, 5 Nov 2021 12:49:14 +0100
Subject: [PATCH] overlays: Import the simple overlay

---
 lib/mkSystem.nix     |  1 +
 overlays/default.nix | 12 +-----------
 overlays/nur.nix     | 10 ----------
 overlays/surface.nix |  4 ++--
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 overlays/nur.nix

diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix
index 5ea38da..e65d7bd 100644
--- a/lib/mkSystem.nix
+++ b/lib/mkSystem.nix
@@ -41,6 +41,7 @@ in inputs.nixpkgs.lib.nixosSystem {
         nur.overlay
         emacs.overlay
         (import ../packages)
+        (import ../overlays/simple.nix)
       ];
     }
 
diff --git a/overlays/default.nix b/overlays/default.nix
index 788e282..fad7e51 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,16 +1,6 @@
-{
-  pkgs
-, lib
-}:
+{ pkgs }:
 
 {
-  emacs = import (builtins.fetchGit {
-    url = "https://github.com/nix-community/emacs-overlay.git";
-    ref = "master";
-    rev = "ce0e9482d53d69bedc8416d8a984d00e17607826";
-  });
-  nur = import ./nur.nix pkgs;
-  custom = import ../packages;
   simple = import ./simple.nix;
   surface = import ./surface.nix pkgs;
 }
diff --git a/overlays/nur.nix b/overlays/nur.nix
deleted file mode 100644
index 0938141..0000000
--- a/overlays/nur.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-pkgs: final: prev:
-
-{
-  nur = import (builtins.fetchTarball {
-    url = "https://github.com/nix-community/NUR/archive/master.tar.gz";
-    sha256 = "0fz7zdfvjfjzg46w7khvwr5jhpd9w8yx0cdd9gnmbkzxhbspbmwq";
-  }) {
-    inherit pkgs;
-  };
-}
diff --git a/overlays/surface.nix b/overlays/surface.nix
index d52e302..bcac85c 100644
--- a/overlays/surface.nix
+++ b/overlays/surface.nix
@@ -1,8 +1,8 @@
-pkgs: final: prev:
+final: prev:
 
 let
   libwacomPatchesCommit = "f811946d7d8bacb3b9ee75f08c150c435ad59331";
-  mkPatch = name: sha256: pkgs.fetchpatch {
+  mkPatch = name: sha256: prev.fetchpatch {
     name = "${name}.patch";
     url = "https://raw.githubusercontent.com/linux-surface/libwacom-surface/${libwacomPatchesCommit}/${name}.patch";
     sha256 = sha256;