From e7079c5c6345bc5ecf7bbcfd121f2c7cb69909cf Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Sat, 21 Dec 2019 19:02:22 -0700
Subject: [PATCH] utils: small cleanup

---
 hosts/default.nix | 7 +++----
 lib/utils.nix     | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index dd5424e..7f7aa29 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -3,8 +3,7 @@ let
   utils = import ../lib/utils.nix { lib = nixpkgs.lib; };
 
   inherit (utils)
-    reqImport
-    vimport
+    recImport
     ;
 
 
@@ -24,7 +23,7 @@ let
           system.configurationRevision = flake.rev;
         };
 
-        local = vimport ./. "${self}.nix";
+        local = import "${toString ./.}/${self}.nix";
       in
         [
           core
@@ -36,6 +35,6 @@ let
     };
 
   hosts =
-    reqImport { dir = ./.; _import = config; };
+    recImport { dir = ./.; _import = config; };
 in
 hosts
diff --git a/lib/utils.nix b/lib/utils.nix
index 691e3f5..bfed468 100644
--- a/lib/utils.nix
+++ b/lib/utils.nix
@@ -24,11 +24,9 @@ rec {
   mapFilterAttrs = seive: f: attrs:
     filterAttrs seive (mapAttrs' f attrs);
 
-  vimport = path: name: import (path + "/${name}");
-
-  reqImport =
+  recImport =
     { dir
-    , _import ? base: vimport dir (base + ".nix")
+    , _import ? base: import "${dir}/${base}.nix"
     }:
       mapFilterAttrs
         (_: v: v != null)