diff --git a/modules/git.home.nix b/modules/git.home.nix
index e76b294..728098d 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  home-manager.users.yoda = {
+  home-manager.users.yoda = { pkgs, ... }: {
 
     # Git config using Home Manager modules
     programs.git = {
diff --git a/modules/nitrokey-ssh-gpg.home.nix b/modules/nitrokey-ssh-gpg.home.nix
index 03ac3a1..6442305 100644
--- a/modules/nitrokey-ssh-gpg.home.nix
+++ b/modules/nitrokey-ssh-gpg.home.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  home-manager.users.yoda = {
+  home-manager.users.yoda = { pkgs, ... }: {
 
     programs.ssh = {
       enable = true;
diff --git a/modules/zsh.home.nix b/modules/zsh.home.nix
index 85793f8..1859ac1 100644
--- a/modules/zsh.home.nix
+++ b/modules/zsh.home.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
 
 {
-  home-manager.users.yoda = {
+  # Inside the following Home Manager configuration block,
+  # `config` refers to Home Manager configuration.
+  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
 
     programs.zsh = {
       enable = true;
@@ -13,10 +15,9 @@
       history.ignoreDups = true;
       #history.ignoreAllDups = true;
 
-      # TODO:
-      #   Currently, `config` is my NixOS config. However, I want to access Home Manager's `config`.
-      #   I could change home-manager.users.yoda to be a function and take config as an argument there.
-      #history.path = "${config.xdg.dataHome}/.histfile";
+      # nix-repl: config.home-manager.users.yoda.programs.zsh.history.path
+      # -> /home/yoda/.local/share/.histfile
+      history.path = "${config.xdg.dataHome}/.histfile";
 
       oh-my-zsh = {
         enable = true;