alias lib-core to lib, lib-contrib to lib.contrib

As promised on 2.0.0 release notes. This is marked as breaking change,
although people migrating from older than 2.0 version might have
some trouble (as lib was previously a function and is now a regular
attrset).

Author: Misterio77

README.md

@@ -187,7 +187,7 @@ want to check out our opinionated contrib functions.
 Our core functions do not require nixpkgs. Nix all the way down (at least until
 you get to nix-the-package-manager code) baby!
 
-All of these are exposed at `nix-colors.lib-core`.
+All of these are exposed at `nix-colors.lib`.
 
 ### `schemeFromYAML`
 
@@ -199,7 +199,7 @@ Just grab (or create yours) a `.yaml` file, read it into a string (with
 ```nix
 { nix-colors, ... }:
 {
-  colorScheme = nix-colors.lib-core.schemeFromYAML "cool-scheme" (builtins.readFile ./cool-scheme.yaml);
+  colorScheme = nix-colors.lib.schemeFromYAML "cool-scheme" (builtins.readFile ./cool-scheme.yaml);
 }
 ```
 
@@ -221,7 +221,7 @@ with nix-repl:
 ```bash
 $ nix repl
 nix-repl> :lf .
-nix-repl> bultins.toFile "pasque.yaml" (inputs.nix-colors.lib-core.schemeToYAML inputs.nix-colors.colorSchemes.pasque)
+nix-repl> bultins.toFile "pasque.yaml" (inputs.nix-colors.lib.schemeToYAML inputs.nix-colors.colorSchemes.pasque)
 ```
 
 ### More soon(TM)
@@ -237,15 +237,15 @@ the idea.
 
 These nifty pals are listed (and documented) at
 [`lib/contrib/default.nix`](lib/contrib/default.nix). They are exposed at
-`nix-colors.lib-contrib`.
+`nix-colors.lib.contrib`.
 
 Do note these require `nixpkgs`, however. You should pass your `pkgs` instance
-to `nix-colors.lib-contrib` to use them. For example:
+to `nix-colors.lib.contrib` to use them. For example:
 ```nix
 { pkgs, nix-colors, ... }:
 
 let
-  nix-colors-lib = nix-colors.lib-contrib { inherit pkgs; };
+  nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
 in {
   colorScheme = nix-colors-lib.colorSchemeFromPicture {
     path = ./wallpapers/example.png;

default.nix

@@ -14,12 +14,13 @@ in
 , base16-schemes ? fromFlake "base16-schemes"
 , ...
 }: rec {
-  lib = import ./lib;
   lib-contrib = import ./lib/contrib;
   lib-core = import ./lib/core { inherit nixpkgs-lib; };
+  lib = lib-core // { contrib = lib-contrib; };
+
   tests = import ./lib/core/tests { inherit nixpkgs-lib; };
 
-  colorSchemes = import ./schemes.nix { inherit lib-core base16-schemes; };
+  colorSchemes = import ./schemes.nix { inherit lib base16-schemes; };
   # Alias
   colorschemes = colorSchemes;
 

lib/default.nix

@@ -1,9 +1,9 @@
-{ lib-core, base16-schemes, ... }:
+{ lib, base16-schemes, ... }:
 let
   inherit (builtins)
     readFile readDir attrNames listToAttrs stringLength substring baseNameOf
     filter;
-  inherit (lib-core) schemeFromYAML;
+  inherit (lib) schemeFromYAML;
 
   # Borrowed from nixpkgs
   removeSuffix = suffix: str: