From 042bd05bcf12efe5371dc4005bf9db6d1678f6b3 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Fri, 6 Aug 2021 04:11:06 +0100
Subject: [PATCH] Break up default.nix into two more files

---
 cache.nix     | 12 ++++++++++++
 default.nix   | 51 +++++++++++++++------------------------------------
 meta-base.nix | 13 +++++++++++++
 3 files changed, 40 insertions(+), 36 deletions(-)
 create mode 100644 cache.nix
 create mode 100644 meta-base.nix

diff --git a/cache.nix b/cache.nix
new file mode 100644
index 00000000..bc7b8ca4
--- /dev/null
+++ b/cache.nix
@@ -0,0 +1,12 @@
+{ lib, sources }:
+
+with lib; let
+  getSources = sources: removeAttrs sources [ "__functor" ]; #"dorkfiles" ];
+  source2drv = value: if isDerivation value.outPath then value.outPath else value;
+  sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources);
+in recurseIntoAttrs rec {
+  local = sources2drvs sources;
+    #hexchen = sources2drvs (import sources.hexchen {}).sources;
+    all = attrValues local; #++ attrValues hexchen;
+    allStr = toString all;
+  };
diff --git a/default.nix b/default.nix
index eafbab0c..47734c74 100644
--- a/default.nix
+++ b/default.nix
@@ -2,57 +2,36 @@ let
   sources = import ./nix/sources.nix;
   pkgs = import ./pkgs { inherit sources; };
   inherit (pkgs) lib;
-
+  sourceCache = import ./cache.nix {
+    inherit sources lib;
+  };
   profiles = lib.modList {
     modulesDir = ./config/profiles;
   };
-
   users = lib.modList {
     modulesDir = ./config/users;
   };
-
-  metaConfig = { ... }: {
-    config = {
-      runners = {
-        lazy = {
-          file = ./.;
-          args = [ "--show-trace" ];
-        };
-      };
-      _module.args = {
-        pkgs = lib.mkDefault pkgs;
-      };
-    };
+  metaConfig = import ./meta-base.nix {
+    inherit pkgs lib;
   };
-
+  hostNames = [
+    "dummy"
+    "athame"
+    "beltane"
+    "samhain"
+    "yule"
+    # "mabon"
+    # "ostara"
+  ];
   eval = lib.evalModules {
     modules = [
       metaConfig
       ./config/targets
       ./config/modules/meta/default.nix
-      ./config/hosts/dummy/meta.nix
-      ./config/hosts/athame/meta.nix
-      ./config/hosts/beltane/meta.nix
-      ./config/hosts/samhain/meta.nix
-      ./config/hosts/yule/meta.nix
-#      ./config/hosts/mabon/meta.nix
-#      ./config/hosts/ostara/meta.nix
-    ];
+    ] ++ map (hostName: ./config/hosts + "/${hostName}/meta.nix") hostNames;
     specialArgs = {
       inherit sources profiles users;
     };
   };
   inherit (eval) config;
-
-
-  sourceCache = with lib; let
-    getSources = sources: removeAttrs sources [ "__functor" ]; #"dorkfiles" ];
-    source2drv = value: if isDerivation value.outPath then value.outPath else value;
-    sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources);
-  in recurseIntoAttrs rec {
-    local = sources2drvs sources;
-    #hexchen = sources2drvs (import sources.hexchen {}).sources;
-    all = attrValues local; #++ attrValues hexchen;
-    allStr = toString all;
-  };
 in config // { inherit pkgs sourceCache sources; }
diff --git a/meta-base.nix b/meta-base.nix
new file mode 100644
index 00000000..9a5aa314
--- /dev/null
+++ b/meta-base.nix
@@ -0,0 +1,13 @@
+{ pkgs, lib, ... }: {
+  config = {
+    runners = {
+      lazy = {
+        file = ./.;
+        args = [ "--show-trace" ];
+      };
+    };
+    _module.args = {
+      pkgs = lib.mkDefault pkgs;
+    };
+  };
+}