From f98248672e1aeacf5d6665d252ce251fe1703249 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 28 Jul 2015 21:00:53 +0200
Subject: Revert "default.nix: lib = import 4lib/krebs"

This reverts commit 981664337fef772422cbc3ca8bcb8ebb85d79b02
---
 default.nix         |  4 ----
 tv/4lib/default.nix | 11 ++++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 322566f6..0ee1c3d0 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,8 @@
 { user-name, system-name }:
 
 let
-  lib = import 4lib/krebs {
-    lib = import <nixpkgs/lib>;
-  };
 
   eval = import <nixpkgs/nixos/lib/eval-config.nix> {
-    inherit lib;
     system = builtins.currentSystem;
     modules = map (p: ./. + "/${p}") [
       "${user-name}/1systems/${system-name}.nix"
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index dbc0c29b..e0a295f1 100644
--- a/tv/4lib/default.nix
+++ b/tv/4lib/default.nix
@@ -1,11 +1,16 @@
 { lib, pkgs, ... }:
 
-with lib;
+let
+  krebs = import ../../4lib/krebs { inherit lib; };
+in
 
-lib // rec {
+with krebs;
+
+krebs // rec {
 
   git = import ./git.nix {
-    inherit lib pkgs;
+    lib = krebs;
+    inherit pkgs;
   };
 
   # "7.4.335" -> "74"
-- 
cgit v1.2.3