From fbce126f4d72c40c6a00948fe05d42ccba7233e2 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deherrera@iohk.io>
Date: Sun, 18 Apr 2021 20:43:37 -0600
Subject: [PATCH] cachix: move out of root and into profile

---
 doc/integrations/cachix.md                    | 13 +++++++++----
 lib/devos/mkHosts.nix                         |  6 +++++-
 cachix.nix => profiles/cachix/default.nix     |  5 ++---
 {cachix => profiles/cachix}/nix-community.nix |  0
 {cachix => profiles/cachix}/nrdxp.nix         |  0
 profiles/core/default.nix                     |  1 +
 6 files changed, 17 insertions(+), 8 deletions(-)
 rename cachix.nix => profiles/cachix/default.nix (76%)
 rename {cachix => profiles/cachix}/nix-community.nix (100%)
 rename {cachix => profiles/cachix}/nrdxp.nix (100%)

diff --git a/doc/integrations/cachix.md b/doc/integrations/cachix.md
index de732dc..3e4f3b5 100644
--- a/doc/integrations/cachix.md
+++ b/doc/integrations/cachix.md
@@ -1,8 +1,13 @@
 # Cachix
-The cachix directory simple captures the output of `sudo cachix use` for the
-developers personal cache, as well as the nix-community cache. You can easily
-add your own cache, assuming the template lives in /etc/nixos, by simply
-running `sudo cachix use yourcache`.
+The system will automatically pull a cachix.nix at the root if one exists.
+This is usually created automatically by a `sudo cachix use`. If your more
+inclined to keep the root clean, you can drop any generated files in the
+`cachix` directory into the `profiles/cachix` directory without further
+modification.
+
+For example, to add your own cache, assuming the template lives in /etc/nixos,
+by simply running `sudo cachix use yourcache`. Then, optionally, move
+`cachix/yourcache.nix` to `profiles/cachix/yourcache.nix`
 
 These caches are only added to the system after a `nixos-rebuild switch`, so it
 is recommended to call `cachix use nrdxp` before the initial deployment, as it
diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix
index 8a8abdb..b48b440 100644
--- a/lib/devos/mkHosts.nix
+++ b/lib/devos/mkHosts.nix
@@ -63,7 +63,11 @@ let
     # Everything in `./modules/list.nix`.
     flakeModules = { imports = builtins.attrValues self.nixosModules ++ extern.modules; };
 
-    cachix = ../../cachix.nix;
+    cachix = let rootCachix = ../../cachix.nix; in
+      if builtins.pathExists rootCachix
+      then rootCachix
+      else { }
+    ;
   };
 
   specialArgs = extern.specialArgs // { suites = suites.system; };
diff --git a/cachix.nix b/profiles/cachix/default.nix
similarity index 76%
rename from cachix.nix
rename to profiles/cachix/default.nix
index 32a3e8d..d88a3f7 100644
--- a/cachix.nix
+++ b/profiles/cachix/default.nix
@@ -1,9 +1,8 @@
-# WARN: this file will get overwritten by $ cachix use <name>
 { pkgs, lib, ... }:
 let
-  folder = ./cachix;
+  folder = ./.;
   toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
+  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in
 {
diff --git a/cachix/nix-community.nix b/profiles/cachix/nix-community.nix
similarity index 100%
rename from cachix/nix-community.nix
rename to profiles/cachix/nix-community.nix
diff --git a/cachix/nrdxp.nix b/profiles/cachix/nrdxp.nix
similarity index 100%
rename from cachix/nrdxp.nix
rename to profiles/cachix/nrdxp.nix
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index f5a654c..1bca2b9 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -2,6 +2,7 @@
 let inherit (lib) fileContents;
 in
 {
+  imports = [ ../cachix ];
 
   nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];