diff --git a/modules/base.home.nix b/modules/base.home.nix
index 7f1d574..a2ec9fb 100644
--- a/modules/base.home.nix
+++ b/modules/base.home.nix
@@ -1,16 +1,21 @@
 { config, pkgs, ... }:
 
 {
-  home-manager.users.yoda = {
+  # This option may become the default value in the future.
+  # https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module
+  home-manager.useUserPackages = true;
+  # This saves an extra Nixpkgs evaluation, adds consistency,
+  # and removes the dependency on NIX_PATH, which is otherwise used for importing Nixpkgs.
+  # https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module
+  home-manager.useGlobalPkgs = true;
+
+  home-manager.users.yoda = { pkgs, ... }: {
     /* The home.stateVersion option does not have a default and must be set */
     /* https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion */
     home.stateVersion = "23.05";
 
     /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
 
-    #home.username = "yoda";
-    #home.homeDirectory = "/home/yoda";
-
 # TODO: See history.path in zsh module.
 #    xdg = {
 #      enable = true;