From cc35703d1733df325aed8d19f0376b02381e0b43 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 18:03:28 +0200
Subject: [PATCH] cachix: default binary cache is nixos.org, no need

to specify it explicitly (results in double entry in nix.conf)

Also force our nix.extraOptions because digga tries real hard to put
their binary caches there:
https://github.com/divnix/digga/blob/0595ae70cdb5ccf1ab031199fe98551c4b378bd9/modules/nix-config.nix#L19-L23
---
 modules/core/nix.nix              |  2 +-
 profiles/cachix/default.nix       | 13 -------------
 profiles/full-install/default.nix |  2 --
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 profiles/cachix/default.nix

diff --git a/modules/core/nix.nix b/modules/core/nix.nix
index 6df8803a..cf174911 100644
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -21,7 +21,7 @@
       allowed-users = ["@wheel"];
     };
     # Generally useful nix option defaults
-    extraOptions = ''
+    extraOptions = lib.mkForce ''
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true
diff --git a/profiles/cachix/default.nix b/profiles/cachix/default.nix
deleted file mode 100644
index 9b810da7..00000000
--- a/profiles/cachix/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  folder = ./.;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
-}
diff --git a/profiles/full-install/default.nix b/profiles/full-install/default.nix
index d3c03da7..d9b07733 100644
--- a/profiles/full-install/default.nix
+++ b/profiles/full-install/default.nix
@@ -7,8 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
-
   config = {
     pub-solar.audio.mopidy.enable = true;
     pub-solar.audio.bluetooth.enable = true;