pkgs: Remove the vuizvui namespace

It's a bit weird to need to write something like this:

nix-build pkgs -A vuizvui.aszlig.vim

We're already within vuizvui, and the filesystem paths are already
structured in a way so that the above is in pkgs/aszlig/vim, so the need
to add the vuizvui attribute to that seems quite pointless and
unnatural.

I have tested this by evaluating a few machines, tests and packages.

Signed-off-by: aszlig <aszlig@nix.build>

1 files changed, 4 insertions, 8 deletions

diff --git a/modules/core/common.nix b/modules/core/common.nix
index f19b5119..f394b038 100644
--- a/modules/core/common.nix
+++ b/modules/core/common.nix
@@ -35,14 +35,10 @@ with lib;
     };
   };
 
-  config = let
-    nixpkgs = import ../../nixpkgs-path.nix;
-    system = config.nixpkgs.system;
-
-  in {
+  config = {
     # Expose all packages in ../../pkgs as pkgs.vuizvui in modules.
-    nixpkgs.overlays = singleton (self: const {
-      inherit (import ../../pkgs { pkgs = self; }) vuizvui;
+    nixpkgs.overlays = singleton (pkgs: const {
+      vuizvui = import ../../pkgs { inherit pkgs; };
     });
 
     nix.binaryCaches = options.nix.binaryCaches.default ++ [
@@ -65,7 +61,7 @@ with lib;
       channelPath = "${rootChannelsPath}/${config.vuizvui.channelName}";
       nixosConfig = "/etc/nixos/configuration.nix";
       nixpkgsConfig = "nixpkgs-config=${pkgs.writeText "nixpkgs-config.nix" ''
-        (import ${nixpkgs}/nixos/lib/eval-config.nix {
+        (import ${pkgs.path}/nixos/lib/eval-config.nix {
           modules = [ ${nixosConfig} ];
         }).config.nixpkgs.config
       ''}";