Finish removal of php-application module

[perso/Immae/Config/Nix.git] / default.nix

diff --git a/default.nix b/default.nix
index e092c3384cd57646724399d050ecdb9d54c5da56..0765c02c765ac3a0ccb9ecc08f5836b767f93801 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,13 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs-nixops { overlays = []; } }:
 let
-  pkgs_ = pkgs;
-  mypkgs = import ./pkgs { pkgs = pkgs_; };
+  mylibs = import ./flakes/mypackages/lib;
+  environments = pkgs.callPackage ./flakes/mypackages/environments {};
+  mypkgs = pkgs.callPackage ./flakes/mypackages/pkgs { inherit mylibs sources environments; };
 in
 {
-  lib = import ./libs.nix { pkgs = pkgs_; };
-  overlays = import ./overlays;
+  lib = mylibs;
+  modules = import ./modules;
+  overlays = import ./flakes/mypackages/overlays { inherit mypkgs sources mylibs; };
   pkgs = mypkgs;
+  inherit environments;
 } // mypkgs