diff --git a/default.nix b/default.nix
index a8d6ff5..1fb5e11 100644
--- a/default.nix
+++ b/default.nix
@@ -1,27 +1,24 @@
 # ============================================================================
 # User Configuration for hdh20267
 # ============================================================================
-# This file defines the user account configuration that will be merged into
-# the NixOS system's ugaif.users namespace.
 
 { inputs, pkgs, ... }:
 
+let
+  # Evaluate package references immediately in the function scope
+  zshPackage = pkgs.zsh;
+  homeConfig = ./home.nix;
+in
 {
-  # ========== User Metadata ==========
-
   description = "HDH";
-  shell = pkgs.zsh;
+  shell = zshPackage;
   hashedPassword = "!";
 
   opensshKeys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBC7xzHxY2BfFUybMvG4wHSF9oEAGzRiLTFEndLvWV/X hdh20267@engr733847d.engr.uga.edu"
   ];
 
-  # ========== External Home Configuration ==========
-
-  home = ./home.nix;
-
-  # ========== Additional ugaif Options ==========
+  home = homeConfig;
 
   useZshTheme = true;
   useNvimPlugins = true;