From c12598ee3cb7e7ee5f51cb4a36006d586b187c0a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 27 Jun 2020 17:02:09 +0200
Subject: [PATCH] Rename overlay

---
 cachix.nix             | 14 --------------
 cachix/hercules-ci.nix | 12 ------------
 home/default.nix       |  2 +-
 home/tinkering.nix     |  2 +-
 overlays.nix           | 11 -----------
 system/default.nix     |  3 +--
 6 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 cachix.nix
 delete mode 100644 cachix/hercules-ci.nix
 delete mode 100644 overlays.nix

diff --git a/cachix.nix b/cachix.nix
deleted file mode 100644
index cce90a32..00000000
--- a/cachix.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# WARN: this file will get overwritten by $ cachix use <name>
-{ pkgs, lib, ... }:
-
-let
-  folder = ./cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
-}
-    
\ No newline at end of file
diff --git a/cachix/hercules-ci.nix b/cachix/hercules-ci.nix
deleted file mode 100644
index a925aa37..00000000
--- a/cachix/hercules-ci.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-
-{
-  nix = {
-    binaryCaches = [
-      "https://hercules-ci.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
-    ];
-  };
-}
-    
\ No newline at end of file
diff --git a/home/default.nix b/home/default.nix
index 65461641..23e04667 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -11,7 +11,7 @@ in {
     ./mpclient.nix
     ./neovim
   ];
-  nixpkgs.overlays = import ../overlays.nix { inherit lib; };
+  nixpkgs.overlays = import ../overlays { inherit lib; };
 
   programs = {
     home-manager.enable = true;
diff --git a/home/tinkering.nix b/home/tinkering.nix
index a488a20f..e3c43ebe 100644
--- a/home/tinkering.nix
+++ b/home/tinkering.nix
@@ -3,7 +3,7 @@
     inherit (pkgs.xorg) xev;
     inherit (pkgs.gitAndTools) hub;
     inherit (pkgs)
-      meld icedtea8_web octave filezilla cachix nix-review gparted
+      meld icedtea8_web octave filezilla nix-review gparted
       grafana-devel;
   };
 }
diff --git a/overlays.nix b/overlays.nix
deleted file mode 100644
index 787067b2..00000000
--- a/overlays.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-let
-  overlayPath = ./overlays;
-  candidates = lib.attrNames (builtins.readDir overlayPath);
-  pathToOverlay = n: overlayPath + ("/" + n);
-  isNixFile = n: builtins.match ".*\\.nix" n != null;
-  isNixDir = n: builtins.pathExists (pathToOverlay n + "/default.nix");
-  isOverlay = n: isNixDir n || isNixFile n;
-  overlays = builtins.filter isOverlay candidates;
-  importOverlay = n: import (pathToOverlay n);
-in map importOverlay overlays
diff --git a/system/default.nix b/system/default.nix
index 72c8b8a8..b151e5de 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -2,7 +2,6 @@
 let me = config.m-0.private.me;
 in {
   imports = [
-    ../cachix.nix
     ../common
     ./modules/laptop.nix
     ./modules/loginctl-linger.nix
@@ -11,7 +10,7 @@ in {
   i18n = { defaultLocale = "en_US.UTF-8"; };
 
   # For nixos-rebuild
-  nixpkgs.overlays = import ../overlays.nix { inherit lib; };
+  nixpkgs.overlays = import ../overlays { inherit lib; };
 
   time.timeZone = "Europe/Berlin";