From ec7eff63eb859325750297a8d525fe5883f51bda Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Sat, 20 Mar 2021 09:37:03 -0700
Subject: [PATCH] move hosts implementation logic to lib as mkHosts

---
 lib/devos/default.nix                      |  2 ++
 hosts/default.nix => lib/devos/mkHosts.nix | 30 ++++++++--------------
 2 files changed, 12 insertions(+), 20 deletions(-)
 rename hosts/default.nix => lib/devos/mkHosts.nix (85%)

diff --git a/lib/devos/default.nix b/lib/devos/default.nix
index ce48824c..e580ef00 100644
--- a/lib/devos/default.nix
+++ b/lib/devos/default.nix
@@ -11,6 +11,8 @@
 
   mkNodes = dev.callLibs ./mkNodes.nix;
 
+  mkHosts = dev.callLibs ./mkHosts.nix;
+
   mkSuites = dev.callLibs ./mkSuites.nix;
 
   mkProfileAttrs = dev.callLibs ./mkProfileAttrs.nix;
diff --git a/hosts/default.nix b/lib/devos/mkHosts.nix
similarity index 85%
rename from hosts/default.nix
rename to lib/devos/mkHosts.nix
index 2a874e86..1d1bfce0 100644
--- a/hosts/default.nix
+++ b/lib/devos/mkHosts.nix
@@ -1,17 +1,8 @@
-{ extern
-, home
-, lib
-, nixos
-, override
-, multiPkgs
-, self
-, defaultSystem
-, ...
-}:
-let
-  inherit (lib) dev;
+{ lib, dev, nixos, inputs, self, ... }:
 
-  suites = import ../suites { inherit lib; };
+{ dir, extern, suites, overrides, multiPkgs, ... }:
+let
+  defaultSystem = "x86_64-linux";
 
   experimentalFeatures = [
     "flakes"
@@ -21,10 +12,9 @@ let
   ];
 
   modules = {
-    core = ../profiles/core;
+    core = "${self}/profiles/core";
     modOverrides = { config, overrideModulesPath, ... }:
       let
-        overrides = import ../overrides;
         inherit (overrides) modules disabledModules;
       in
       {
@@ -48,7 +38,7 @@ let
       nix.nixPath = [
         "nixpkgs=${nixos}"
         "nixos-config=${self}/compat/nixos"
-        "home-manager=${home}"
+        "home-manager=${inputs.home}"
       ];
 
       nixpkgs.pkgs = lib.mkDefault multiPkgs.${config.nixpkgs.system};
@@ -56,7 +46,7 @@ let
       nix.registry = {
         devos.flake = self;
         nixos.flake = nixos;
-        override.flake = override;
+        override.flake = inputs.override;
       };
 
       nix.extraOptions = ''
@@ -71,7 +61,7 @@ let
     # Everything in `./modules/list.nix`.
     flakeModules = { imports = builtins.attrValues self.nixosModules ++ extern.modules; };
 
-    cachix = ../cachix.nix;
+    cachix = ../../cachix.nix;
   };
 
   specialArgs = extern.specialArgs // { suites = suites.system; };
@@ -80,7 +70,7 @@ let
     let
       local = {
         require = [
-          "${toString ./.}/${hostName}.nix"
+          "${dir}/${hostName}.nix"
         ];
 
         networking = { inherit hostName; };
@@ -106,7 +96,7 @@ let
 
   hosts = dev.os.recImport
     {
-      dir = ./.;
+      inherit dir;
       _import = mkHostConfig;
     };
 in