diff --git a/lib/builders/default.nix b/lib/builders/default.nix
index 4b62510a..a2752526 100644
--- a/lib/builders/default.nix
+++ b/lib/builders/default.nix
@@ -1,8 +1,10 @@
 { pkgs, lib, self }:
 
 {
-  makeXDGMimeAssociationList = pkgs.callPackage ./xdg/make-association-list.nix { };
-  makeXDGPortalConfiguration = pkgs.callPackage ./xdg/make-portal-config.nix { };
+  makeXDGMimeAssociationList =
+    pkgs.callPackage ./xdg/make-association-list.nix { };
+  makeXDGPortalConfiguration =
+    pkgs.callPackage ./xdg/make-portal-config.nix { };
   makeXDGDesktopEntry = pkgs.callPackage ./xdg/make-desktop-entry.nix { };
   buildHugoSite = pkgs.callPackage ./hugo-build-site { };
   buildFDSEnv =
diff --git a/lib/default.nix b/lib/default.nix
index 7d96389e..85ec1605 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -6,19 +6,18 @@
 # If you have to add those functions, you'll have to add them in configUtils.
 { pkgs }:
 
-let
-  inherit (pkgs) lib;
-in
-pkgs.lib.makeExtensible
-(self:
-  let
-    callLib = file: import file { inherit pkgs lib self; };
+let inherit (pkgs) lib;
+in pkgs.lib.makeExtensible (self:
+  let callLib = file: import file { inherit pkgs lib self; };
   in {
-    builders = callLib ./builders;
     trivial = callLib ./trivial.nix;
     data = callLib ./data.nix;
     math = callLib ./math.nix;
+
+    # For future references, these are the only attributes that are going to be
+    # exported as part of nixpkgs overlay.
     fetchers = callLib ./fetchers;
+    builders = callLib ./builders;
 
     # foodogsquared's version of a standard environment. Basically just an
     # extended version of nixpkgs' version that went overboard with
@@ -33,6 +32,7 @@ pkgs.lib.makeExtensible
         pkg-config
         man-pages
         man-pages-posix
+        neovim
       ] ++ (import "${pkgs.path}/pkgs/stdenv/generic/common-path.nix" {
         inherit pkgs;
       });