From 9670fa4b0fd0f82e2f6896d54851d6ea861f9f23 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Sun, 5 Jan 2020 15:39:59 -0700
Subject: [PATCH] Revert "utils: now lives in lib.utils globally"

This reverts commit c9944b411ed3bdbbbea6c972dde26242e8a51a57.
Causes infinite recursion, revert for now while exploring possible
solutions.
---
 flake.nix         | 6 +++---
 hosts/default.nix | 6 ++++--
 lib/utils.nix     | 1 -
 pkgs/default.nix  | 1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8abe835..97952cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,9 +16,9 @@
         overlays = self.overlays;
       };
     in {
-      nixosConfigurations =
-        let configs = import ./hosts ({ lib = pkgs.lib; } // args);
-        in configs;
+      nixosConfigurations = let configs = import ./hosts args;
+
+      in configs;
 
       overlay = import ./pkgs;
 
diff --git a/hosts/default.nix b/hosts/default.nix
index 764794f..8a71c9f 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,6 +1,8 @@
-args@{ lib, home, nixpkgs, self, ... }:
+args@{ home, nixpkgs, self, ... }:
 let
-  inherit (lib.utils) recImport;
+  utils = import ../lib/utils.nix { lib = nixpkgs.lib; };
+
+  inherit (utils) recImport;
 
   inherit (builtins) attrValues removeAttrs;
 
diff --git a/lib/utils.nix b/lib/utils.nix
index 1c4d210..53d92c4 100644
--- a/lib/utils.nix
+++ b/lib/utils.nix
@@ -11,7 +11,6 @@ in rec {
   #   attrs
   mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs);
 
-  # used in hosts/default.nix
   recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
     mapFilterAttrs (_: v: v != null) (n: v:
       if n != "default.nix" && hasSuffix ".nix" n && v == "regular"
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0ab0b4d..6b6a37d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,5 +3,4 @@ final: prev: {
     prev.callPackage ./applications/display-managers/sddm/themes/chili { };
   dejavu_nerdfont = prev.callPackage ./data/fonts/dejavu-nerdfont { };
   purs = prev.callPackage ./shells/zsh/purs { };
-  lib = prev.lib // { utils = import ../lib/utils.nix { lib = prev.lib; }; };
 }