X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=default.nix;h=1f43cdd93883294eb3e4b67df4a1d66b7b98fd72;hp=e092c3384cd57646724399d050ecdb9d54c5da56;hb=ce95026934c4ea8c647365f68eb195459fcdff08;hpb=fdf6f74d3221e3dad853898f296149baea0aa476

diff --git a/default.nix b/default.nix
index e092c33..1f43cdd 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,11 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs {} }:
 let
-  pkgs_ = pkgs;
-  mypkgs = import ./pkgs { pkgs = pkgs_; };
+  mypkgs = pkgs.callPackage ./pkgs {};
 in
 {
-  lib = import ./libs.nix { pkgs = pkgs_; };
+  lib = pkgs.callPackage ./lib {};
+  modules = import ./modules;
   overlays = import ./overlays;
   pkgs = mypkgs;
+  environments = pkgs.callPackage ./environments {};
 } // mypkgs