summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--default.nix4
-rw-r--r--tv/4lib/default.nix11
2 files changed, 8 insertions, 7 deletions
diff --git a/default.nix b/default.nix
index 322566f6a..0ee1c3d05 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 dbc0c29b7..e0a295f17 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"