From a31b3699b4a2e4b01db0a0e7da0ce38af816e9c4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 18 Jul 2017 21:13:36 +0200
Subject: [PATCH] nix: include cache.nixos.org by default

---
 modules/nix/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 6d65574..111d620 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -209,7 +209,7 @@ in
 
       binaryCaches = mkOption {
         type = types.listOf types.str;
-        default = [ https://cache.nixos.org/ ];
+        example = [ https://cache.example.org/ ];
         description = ''
           List of binary cache URLs used to obtain pre-built binaries
           of Nix packages.
@@ -219,7 +219,7 @@ in
       trustedBinaryCaches = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        example = [ http://hydra.nixos.org/ ];
+        example = [ https://hydra.example.org/ ];
         description = ''
           List of binary cache URLs that non-root users can use (in
           addition to those specified using
@@ -308,7 +308,8 @@ in
     warnings = mkIf (!config.services.activate-system.enable && cfg.distributedBuilds)
       [ "services.activate-system is not enabled, a reboot could cause distributed builds to stop working." ];
 
-    nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+    nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ];
+    nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
 
     environment.etc."nix/nix.conf".source = nixConf;