diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix
index 9e84e84..88ab43c 100644
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -83,7 +83,7 @@ in {
 
       rshellconf = "source ${homeDirectory}/.zshrc";
       nrsw = "sudo darwin-rebuild switch --flake ${homeDirectory}/nixos#macbook";
-      opencode-local = "/Users/jmug/dev/opencode/dist-local/bin/opencode"; # Replace with the app.
+      opencode-local = "${homeDirectory}/dev/opencode/dist-local/bin/opencode";
     };
 
     initContent = ''
diff --git a/modules/nixos/yubikey/default.nix b/modules/nixos/yubikey/default.nix
index b5c0260..7a6559b 100644
--- a/modules/nixos/yubikey/default.nix
+++ b/modules/nixos/yubikey/default.nix
@@ -50,8 +50,7 @@
   ...
 }:
 let
-  # homeDirectory = "${config.hostSpec.home}";
-  homeDirectory = "/home/jmug"; # Should be parametric.
+  homeDirectory = config.user.homeDirectory;
   yubikey-up =
     let
       yubikeyIds = lib.concatStringsSep " " (