flake: Removed lib/default.nix. Use callPackage to clean up use of lib utilities

This commit is contained in:
Giulio De Pasquale 2023-02-11 03:09:42 +01:00
parent c3c61f0248
commit 7dc674f24f
2 changed files with 6 additions and 7 deletions

View File

@ -32,7 +32,12 @@
};
wrapUtils = { pkgs, unstable, system }:
import ./lib { inherit nixpkgs nixos-unstable home-manager system pkgs unstable; };
pkgs.lib.makeScope pkgs.newScope (self: {
inherit nixpkgs home-manager nixos-unstable;
user = self.callPackage ./lib/user.nix { };
host = self.callPackage ./lib/host.nix { };
});
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };

View File

@ -1,6 +0,0 @@
{ pkgs, unstable, nixpkgs, nixos-unstable, home-manager, system, ... }: rec {
user = import ./user.nix { inherit pkgs unstable system home-manager; };
host = import ./host.nix {
inherit pkgs nixpkgs unstable nixos-unstable home-manager user system;
};
}