diff --git a/configs/nixos/modules/shell/fish/default.nix b/configs/nixos/modules/shell/fish/default.nix
index d91b313..8a4916a 100644
--- a/configs/nixos/modules/shell/fish/default.nix
+++ b/configs/nixos/modules/shell/fish/default.nix
@@ -8,8 +8,8 @@
 let
   cfg = config.modules.shell.fish;
   user = config.user.name;
-  shortcuts = config.registry.shell-shortcut.${config.networking.hostName};
-  envVars = config.registry.env-var.${config.networking.hostName};
+  shortcuts = lib.attrByPath [ config.networking.hostName ] { } config.registry.shell-shortcut;
+  envVars = lib.attrByPath [ config.networking.hostName ] { } config.registry.env-var;
   commandsOf = shortcuts: lib.mapAttrs (_name: shortcut: shortcut.command) shortcuts;
   exportEnvVar = name: value: ''
     set -gx ${name} ${lib.escapeShellArg value}